Commit Graph

22992 Commits

Author SHA1 Message Date
Fox McCloud
577b24b8dc Merge pull request #15334 from AffectedArc07/maze-generator
AA's Monolith Maze Machine
2021-02-15 05:54:29 -05:00
SabreML
0cdf3a0d12 'Send Mob' cancel button (#15499) 2021-02-15 10:38:36 +00:00
AffectedArc07
963b4dd6c0 Simulates this 2021-02-15 10:36:06 +00:00
AffectedArc07
e81e6f2bb9 Merge remote-tracking branch 'ParadiseSS13/master' into maze-generator 2021-02-15 10:20:52 +00:00
Ryal
388c1d8852 Fixes missed edge case (#15531)
* Fixes formatting on request consoles.

* Update requests_console.dm

* Fixes oversight in previous PR
2021-02-15 10:17:25 +00:00
SteelSlayer
915afa3c05 Update pyrotechnic.dm (#15526) 2021-02-14 11:04:34 +00:00
Fox McCloud
9bf63badbf Beach Unsimulated Removal (#15476) 2021-02-13 22:29:00 +00:00
Ryal
70a130ee61 Fixes formatting on request console logs (#15505)
* Fixes formatting on request consoles.

* Update requests_console.dm
2021-02-13 13:22:16 +00:00
SabreML
25e4a137de Cyborg zone select directions (#15500) 2021-02-11 18:02:47 +00:00
dearmochi
617e62b66f Fix and tweak parrot behaviour (#13652)
* Fix and tweak parrot behaviour

Parrot stolen item now renders under the parrot's icon to make it more clear when it holds something - remember to harm the parrot to make it drop the item
Parrot adjacency checks now take windows into account - this fixes issues where the parrot would teleport behind a window to perch/steal an item
Parrots no longer try to perch/steal an item in a turf that is inaccessible to them infinitely, causing them to be stuck
Add emotes when parrot drops item
Change default parrot name to not be improper
Clean up code where possible
Correct grammar errors in parrot messages
Fix attacking parrots in harm mode not triggering specific behaviour

* Code cleanup, CanAStarPassTo atom proc

* Fix Travis

* Address farie

* Address farie 2

* fix atkverb confusion

* use LAZYINITLIST

* remove some out of scope defaults
2021-02-10 22:41:41 +00:00
SabreML
c4b1c724aa Hardsuit hair (#15498) 2021-02-10 21:33:48 +00:00
Ryal
a18c22e2fa Removes refilling code from drinks for borgs. Makes Beer2 refill slightly faster. (#15277) 2021-02-10 18:25:19 +00:00
Qwertytoforty
8f9ab3dac6 Prevents the possessor crystal from possessing bots (#15424)
* Prevents the possessor crystal from possessing bots

* Update code/modules/mining/lavaland/loot/colossus_loot.dm

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2021-02-10 18:21:29 +00:00
dearmochi
649ba35946 Removes Contractor upwards variation on TC payout (#15451) 2021-02-10 18:17:27 +00:00
SabreML
c864fbe20f Arrivals message html (#15465) 2021-02-10 18:16:16 +00:00
hal9000PR
2aeac3166f Cowabunga it is (#15487) 2021-02-10 18:15:17 +00:00
SabreML
ae3c63936b Cryo announcement language fix (#15493) 2021-02-10 16:33:20 +00:00
Fox McCloud
63aa764241 Merge pull request #15462 from Qwertytoforty/a-shocking-change
Nerfs botany potatoes
2021-02-09 00:32:46 -05:00
Fox McCloud
27d8804662 Merge pull request #15447 from hal9000PR/radiation-goes-brrrr
Buffs Potassium Iodine and Pentetic Acid's radiation healing.
2021-02-09 00:30:28 -05:00
dearmochi
94a3481a89 Fixes wrong atom name being used when failing to equip something (#15459) 2021-02-08 09:17:18 +00:00
Kyep
c9f587010e fix (#15467)
Co-authored-by: Kyep <Kyep@users.noreply.github.com>
2021-02-07 21:33:11 +00:00
Qwertytoforty
66d987691c Fixes wallrot (#15461) 2021-02-07 16:11:41 +00:00
Qwertytoforty
827ab7786a Nerfs botany potatoes 2021-02-07 10:47:54 -05:00
Fox McCloud
935a092179 Merge pull request #15403 from AffectedArc07/sm-delam-stat
Adds a stat for supermatter delaminations
2021-02-07 06:08:14 -05:00
Fox McCloud
aa86510c54 Turf Refactor, Part 1: Purging /turf/simulated/shuttle (#15454)
* Turf Refactor, Part 1: Purging /turf/simulated/shuttle

* everything but shuttle templates

* it is done

* titanium airlocks

* correcting multi-turfs
2021-02-07 11:06:55 +00:00
SabreML
715ceb2c11 Adds a name for the Chef's pet Goat (#14222)
* Added a name to the Chef's pet goat

* Changed 'unique_pet' to true, to stop renaming

Also changed 'New()' to 'Initialize()', since it's better.

* Revert "Changed 'unique_pet' to true, to stop renaming"

This reverts commit b8f722b161.

* Revert "Added a name to the Chef's pet goat"

This reverts commit 034a83b1f1.

* The Chef's goat is now named Pete

* Pete is now a subtype

* 'unique_pet' is now 'TRUE', rather than '1'

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2021-02-06 21:54:08 +00:00
Fox McCloud
b3b11a81c5 LINDA Performance Refactor (#15384)
* LINDA Performance Refactor

* forget about this

* very important refactor content
2021-02-06 21:50:11 +00:00
hal9000PR
2a2f69f6a3 sord 2021-02-05 21:56:41 +00:00
SabreML
298bff6b7a Channel removal (#15443) 2021-02-05 11:29:19 +00:00
Kyep
b11a97398f SM engine APCs no longer short out during APC short/overload events (#15439)
Co-authored-by: Kyep <Kyep@users.noreply.github.com>
2021-02-05 11:28:02 +00:00
Fox McCloud
228ae8ff64 Purging Will Continue Until Simulations Improve (#15436) 2021-02-04 16:53:17 +00:00
AffectedArc07
95e4bf87c7 Fixes and improves TGS revision info (#15283)
* Initial Commit

* Fixes this

* Try this

* Apply suggestions from code review

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2021-02-04 11:07:20 -05:00
AffectedArc07
e25cdc791f Initialized singulo 2021-02-03 22:09:23 +00:00
SabreML
6a8ef73719 Some Admin/Mentor help improvements (#15415)
* Ticket thing V1

* Flipped Buttons
2021-02-03 21:57:07 +00:00
Fox McCloud
8997cd114d Merge pull request #15433 from AffectedArc07/initialized-shuttles
Initialized /obj/docking_port
2021-02-03 15:53:17 -05:00
Fox McCloud
8947e97f3b Refactors Electrocution and Tesla Zapping (#15357)
* Refactors Electrocution and Tesla Zapping---Improves Supermatter and Tesla

* forgot this one

* fixes and styling

* last tidbits hopefully

* machine frames

* use flags

* styling
2021-02-03 20:52:03 +00:00
AffectedArc07
6b47d10f00 Mapload arg 2021-02-03 20:44:37 +00:00
AffectedArc07
d9f4895f78 Initialized /obj/docking_port 2021-02-03 19:00:26 +00:00
dearmochi
7b1ddc9c81 Makes the Contractor Kit a 20 TC uplink purchase (#15284)
* Makes the Contractor Kit a 20 TC uplink purchase

Increases Blackout cooldown to 45 minutes
Adds logging on target extraction

* Removes clear TP topic

* Non-traitors can no longer purchase the kit

* Update locate()

* Prevents vampires and changelings from buying

* remove spess

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-02-03 15:48:00 +00:00
Fox McCloud
f15c90ad5e Removes Space Hotel (#15416)
* Removes Space Hotel

* tweak
2021-02-03 10:29:49 +00:00
Fox McCloud
6074323192 Further Updates Windows (#15427)
* Further Updates Windows

* correction
2021-02-03 10:04:52 +00:00
Kyep
38d1c93586 Prevents server-freezing spin() calls (#15428)
* Fixes server-freezing spin() calls

* AA suggestion

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

Co-authored-by: Kyep <Kyep@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-02-03 09:22:53 +00:00
Fox McCloud
b003474bdc Merge pull request #15420 from AffectedArc07/initialized-spacepods
Initialized spacepods
2021-02-02 15:38:11 -05:00
SteelSlayer
69da27fe10 Fixes an issue when saving preferences while using an IPC character (#15421)
* sql fix

* wrong var
2021-02-02 19:57:54 +00:00
AffectedArc07
c7f99899b3 Initialized spacepods 2021-02-02 13:08:37 +00:00
github-actions[bot]
d27f9e584f Automatic TGS DMAPI Update (#15412)
* Update TGS DMAPI

* Cleanup attributes

Co-authored-by: DMAPI Update <action@github.com>
2021-02-02 12:46:09 +00:00
Kyep
b7fe4241e3 [TGUI] TEG (#15367)
* TGUI TEG

* rm

Co-authored-by: Kyep <Kyep@users.noreply.github.com>
2021-02-02 10:04:39 +00:00
dearmochi
1d89138436 [TGUI] GPS (#15335)
* [TGUI] GPS

* Address AA

* Why are you here

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-01-31 16:04:51 +00:00
AffectedArc07
2c1123ddc3 Adds a stat for supermatter delaminations 2021-01-31 13:33:56 +00:00
SabreML
c7bea0eb8e [TGUI] Drone Control Console (#15222)
* Drone UI V1

* Bigger button

And admin log clarification

* Review 1

Also commented out the drone 'rebooting' action, since it didn't work.

* Spacing

Seemed a bit too cluttered.

* Review 2

Co-Authored-By: dearmochi <shenesis@gmail.com>

Co-authored-by: dearmochi <shenesis@gmail.com>
2021-01-30 23:54:09 +00:00