Commit Graph

40933 Commits

Author SHA1 Message Date
Leo 3757ef5943 Merge pull request #28850 from GunHog/Malf_Shell_Fix
Fixes AI <-> Shell mind transfer issues
2017-06-27 12:29:36 -03:00
Ergovisavi a08aa9e3a2 Fixes resin stacking & allows lasers to pass through resin (#28842)
* Fixes resin stacking
Lets you shoot through Resin with lasers!

* Small code cleanup

* TRUE
2017-06-27 09:29:26 -04:00
Really-Good-Soda-Flavor 930b15e625 Adds container types INJECTABLE and DRAWABLE (#28853)
* Adds container types INJECTABLE and DRAWABLE

* Make the chemistry readme a text file and updates it!

* Unfucks the readme!

* Another attempt at fixing the readme

* Remove the readme from the .dme

why was it a dm file!!
2017-06-27 09:19:25 -04:00
Jordan Brown 99a1e92364 Merge pull request #28841 from Ergovisavi/muh_crystal
Some fixes for the anomalous crystal
2017-06-27 09:12:46 -04:00
AnturK d3bf259d9d Fixes lings losing organs on humanization 2017-06-27 09:18:15 +02:00
Jordan Brown e6abdde003 Merge pull request #28831 from p440/28745-modular_consoles
Fix modular consoles
2017-06-26 23:01:39 -04:00
Jordan Brown 2b35f59c61 Merge pull request #28834 from KorPhaeron/stompstompstomp
Fixes the ancient suit from makings stomping noises in peoples hands
2017-06-26 23:00:58 -04:00
shizcalev 6e5de87b98 removed domi from ai blacklist 2017-06-26 19:42:46 -04:00
Leo 2e0bf10a30 Merge pull request #28822 from ChangelingRain/hierophantfix
Fixes the Hierophant's walls runtiming
2017-06-26 17:58:42 -03:00
Leo 2824b6e7e3 Merge pull request #28821 from kevinz000/patch-231
Fixes PAIs deleting their card on death
2017-06-26 17:54:34 -03:00
Xhuis e7a98978fd Fixes straight jackets 2017-06-26 12:39:28 -04:00
shizcalev 7a7d7d3187 Fixes Malf AI exploit 2017-06-26 12:32:17 -04:00
Mike Long 4185f8959f Fixes bugs in devil
Fixes devils not losing souls upon resurrection,.
Fixes spells appearing deactivated upon resurrection.
Fixes unascendable devils being able to get ascension grade spells.
2017-06-26 12:30:59 -04:00
Jordan Brown ef96559701 Removes cortical borers 2017-06-26 11:21:08 -04:00
Jordan Brown dfc5a47c7e Merge pull request #28765 from KorPhaeron/tree
Small jungle trees
2017-06-26 10:41:52 -04:00
kevinz000 30f27ffbc4 Fixes the AI core being flammable (#28814) 2017-06-26 11:38:02 -03:00
GunHog 14e3b9a7c2 Fixes AI <-> Shell mind transfer issues
- Fixed Traitor/Malf AIs resetting their antagonist status and points
upon transfering to a shell and back.

- Fixes connected borgs being shown their laws when the AI returns to
its shell.
2017-06-26 09:37:25 -05:00
Joan Lung 9dbe3253d0 Adds some neat tiles and walls for use on lavaland (#28760)
* Adds some neat tiles and walls for use on lavaland

* heh

* these, too

* misflip
2017-06-26 11:18:51 -03:00
KorPhaeron 1fde4943b5 Initialize 2017-06-26 10:13:25 -04:00
kevinz000 226c0f1636 Fixes piggybacking giving person on top projectile density instead of the person on the bottom. (#28770) 2017-06-26 11:01:17 -03:00
KorPhaeron 060b767a47 Ninja Dash (#28644) 2017-06-26 10:57:12 -03:00
KorPhaeron 63ee5b9665 istype 2017-06-26 09:30:54 -04:00
KorPhaeron f5a1ce0492 Uses the proper icon file 2017-06-26 09:29:52 -04:00
Jordan Brown e9a66eb6ec Fixes resin attack message (#28789) 2017-06-26 13:02:52 +02:00
Jordan Brown ff574a0a1b Improves Ahelp feedback (#28782)
* Improves Ahelp feedback

* Update adminhelp.dm
2017-06-26 13:01:08 +02:00
Ergovisavi 2a7e4f1d6c Some fixes for the anomalous crystal 2017-06-26 00:24:37 -07:00
Kyle Spier-Swenson 4307972412 Makes goonchat robust. (#28750)
* Temp fix for output control issue messing up goonchat

I'll need to do some more testing on this, but this should likely be a test mergeable fix. I might not be back at my home computer until sunday night/monday.

* Fix quote

* Adds verb to fix goonchat and log what was needed to fix it.

Makes shit robust, AND lets it know whats going on.

* Update ooc.dm

* Fix some stupidity in to_chat

* Simplify the winset

Disabling the controls seems to do nothing effective.

* y-you too, t-thanks

* Fix some short term memory issues in the code.

* Warns users to update byond if goonchat gets overridden by old chat
2017-06-26 01:03:40 -04:00
some dumbass 3c83b45fcf Move list() out of New() 2017-06-25 22:01:37 -07:00
Jordan Brown fe1ee70961 Merge pull request #28766 from KorPhaeron/robot
Robotic legs are not weak to glass shards
2017-06-26 00:46:38 -04:00
KorPhaeron 3e04565ec0 Stomp 2017-06-25 22:49:24 -04:00
KorPhaeron 6f3dd2010f Fixes sounds on ancient hardsuit 2017-06-25 22:48:08 -04:00
AnturK 0c3edf1ff7 Shuttle engines affecting travel time (#28564) 2017-06-25 22:52:06 -03:00
Jordan Brown 4e2793e5f7 Merge pull request #28805 from ShizCalev/vent_mastah
Cleans up vent varedits
2017-06-25 21:42:12 -04:00
some dumbass 81a017d353 Fix modular consoles by having a list ready
processors try to add components to the list on Initialize()
list probably doesnt exist yet due to vOv

Fixes #28745
2017-06-25 17:45:26 -07:00
Jordan Brown ca715f65dc Merge pull request #28771 from Xhuis/lowercases_glasses
Lowercases the names of most glasses, changes the thermonocle's description based on its examiner
2017-06-25 19:55:30 -04:00
Xhuis 93026d5a76 ant SIGHT or ant MIGHT? 2017-06-25 17:26:21 -04:00
Joan Lung 601ad4beda Adds the Cleaving Saw as what will be the reward for killing a miniboss (#28565)
* Adds the Cleaving Saw as what will be a reward for killing a miniboss

* slashslice

* wowduh

* some tweaks

* bleed!

* a little slower

* Smaller cleave, higher damage

* more info

* saw icon

* It's finally dooooone!

* done
2017-06-25 12:49:32 -04:00
Joan Lung 70e712017e Status effects start processing immediately instead of on the next timer subsystem tick (#28747)
* Status effects start processing immediately instead of on the next timer subsystem tick

* let's fix this while we're at it

* hup

* not technically efficient but better than not updating when needed
2017-06-25 12:47:10 -04:00
kevinz000 195518b0c9 Update death.dm 2017-06-25 09:37:17 -07:00
shizcalev e1086bb616 merge conflict fix 2017-06-25 12:35:36 -04:00
RandomMarine bdd54531c8 Exporting mechs! (#28749)
* exporting mechs

* remove null

* do the thing the maintainer wants

* non-snowflek

* Minor thing
2017-06-25 12:34:09 -04:00
Joan Lung 8fae499bb2 Fixes the Hierophant's walls runtiming 2017-06-25 12:20:36 -04:00
Jordan Brown 94effbd25f Replaces all instances of the tgstation2 map with Box Station (#28463)
* Replaces all instances of the tgstation2 map with BoxStation

* Fix basemap
2017-06-25 18:15:56 +02:00
Steelpoint f8ee37afc0 Ancient Space Station [Space Spawn Ruin] (#28584)
* FirstCommit

* HardsuitAncientSounds

* FurtherWorkSave

* HivebotSpriteMinorMapChange

* FinalFixesPrePR

* MinorFixes

* FixesPart1

* TGMMap

* Wording

* VoidSuitPlusSpelling

* TGMConv

* MoreSpelling

* RadioStorm

* SomehowGotThisToWork
2017-06-25 12:02:31 -04:00
Steelpoint 56a4c179b4 Station Engineers Spawn With Industrial Welder (#28740)
* InitialCommit

* LargeToSmall
2017-06-25 10:17:14 -04:00
Jordan Brown 8748ed4d5a Machinery clears it's occupant var if removed (#28748) 2017-06-25 09:42:02 -03:00
Leo a4b3dd3b9a Merge pull request #28755 from JJRcop/tkgrab_teleport_item
[s] Fixes TK remote grab exploit
2017-06-25 09:40:44 -03:00
Jordan Brown 8d80e4dce5 Merge pull request #28753 from MrStonedOne/patch-383
Fixes the server taking for fucking ever to initialize for local test
2017-06-24 23:22:06 -04:00
Xhuis ba59ef0410 Cache money 2017-06-24 19:59:13 -04:00
Nick 4140b5bc59 Centcom starts importing cat ears/tails (#28732)
* Update organs.dm

* Update organs.dm

* Update organs.dm

* Update organs.dm
2017-06-24 18:47:44 -04:00