Commit Graph

171 Commits

Author SHA1 Message Date
deathride58 a664384e81 Bhijn's touching dogborg balance again everyone panic (#3432)
* rebuffs everything and puts babyproof locks on scrubpup compactor

* lets it compile, removes things from the blacklist

* readds telegraphing due to popular vote, removes flash from scrubpups

* does githubs text editor work for basic thing on mobile

* reverts blacklist changes

* keeps spoolup, removes sounds + anime prepounce effects
2017-10-24 22:04:51 -05:00
Jordan Brown c51edc3bcd Removes duplicate typecaches 2017-10-23 08:25:30 -05:00
oranges bc5c548e9b Merge pull request #31989 from ninjanomnom/radiation-borg-fix
Fixes silicon mob contents becoming contaminated
2017-10-21 22:22:01 -05:00
Poojawa 7b8e88ec7e Medihound Fixes (#3462)
* fix borgs, tries new things

* TGUI experiment, Expanded resist

also cleans up some bad code we don't want to keep

* kinda important to have the right one

* I actually managed to compile tgui

* tgui fuckery

I hate UI building

* more tgui tweaks

and it finally compiles, again.

* Have I mentioned UIs are not my strong point?

Because they're really not

* updates to this shit thing.

Tgui button chem selection -> chem to inject needs to be fixed

* No.

* FUCKING, FINALLY
2017-10-21 06:15:50 -05:00
CitadelStationBot adc2e46114 [MIRROR] Does some code standardization/consistency. (#3161)
* Does some code standardization/consistency.

* fixes merge conflict generation

* Missed a few, oops

* Update pierrot_throat.dm
2017-10-21 06:10:22 -05:00
LetterJay 72c8c8318d Merge pull request #3507 from Citadel-Station-13/upstream-merge-31819
[MIRROR] Fixes AI visiblity checks
2017-10-19 09:24:28 -04:00
YPOQ d04818e6f9 Fixes AI visiblity checks (#31819) 2017-10-19 05:42:52 -05:00
Leo 5ad2b5d866 Merge pull request #31830 from ShizCalev/geiger-borg
Gives engi borgs geiger counters
2017-10-18 07:24:53 -05:00
LetterJay 250f55e072 Merge pull request #3477 from Citadel-Station-13/upstream-merge-31630
[MIRROR] Datum rev & related upgrades to base datum antag
2017-10-18 07:42:54 -04:00
AnturK 2ecb4c216c Datum rev & related upgrades to base datum antag 2017-10-18 02:26:11 -05:00
YPOQ b643de63f5 Removes toggle camera light verb (#31821) 2017-10-17 23:18:52 -05:00
Jordan Brown 4e4f2fa19d Merge pull request #31713 from vuonojenmustaturska/initializefixesoct
Fixes a bunch of runtimes involving supermatter suicides, also some initialize fixes
2017-10-15 11:32:05 -05:00
LetterJay e72d36c381 Merge pull request #3406 from deathride58/heavysechoundnerfs
INTENSE BORGO BALANCE CHANGES
2017-10-15 10:23:37 -04:00
deathride58 47195cdbf0 INTENSE BORGO BALANCE TWEAKS 2017-10-15 00:30:22 -04:00
kevinz000 b20e5916ea Removes a bunch of sleeps/spawns and makes a few booleans defines 2017-10-14 18:53:48 -05:00
Jordan Brown bd7a0d65b5 Fix many instances of "the the" 2017-10-13 09:41:54 -05:00
Tad Hardesty 00606b9303 Fix lavaland turfs looking awkward to AIs (#31554) 2017-10-12 10:40:38 -05:00
LetterJay b0c833059e Update chunk.dm 2017-10-10 04:40:26 -05:00
oranges 494bb0222c Makes cameras work on shuttles 2017-10-10 03:15:13 -05:00
kevinz000 687b329b7b Update pai.dm (#31379) 2017-10-08 15:47:32 -05:00
LetterJay 641ffe003b Update silicon.dm 2017-10-07 22:51:58 -05:00
Jordan Brown 075cb673c0 Remove drop_item, drop_item_v, put_in_hands_or_del 2017-10-07 12:37:06 -05:00
Leo 0888d3944e Merge pull request #31210 from MoreRobustThanYou/patch-7
Silicons can no longer take brain damage
2017-10-03 06:20:51 -05:00
oranges d701230090 Merge pull request #31114 from AnturK/spacevision
Fixes space vision
2017-10-01 15:15:54 -05:00
LetterJay 747312cb6d updates 2017-10-01 00:59:59 -05:00
LetterJay 04d071deda Merge branch 'master' into upstream-merge-30763 2017-09-30 15:30:46 -04:00
LetterJay 47a65d829d Merge branch 'master' into upstream-merge-29741 2017-09-30 13:35:47 -04:00
oranges 384332fe20 Small refactor to movement (#31071)
You can now move an object into nullspace, which will call exited on
it's parent and parent area but will not call any entered.

Note that you cannot pass null into forceMove it will crash, instead use
the new proc that will call the underlying logic with a null destination

Some of the force move procs have been refactored to check that their
parent move succeeded before doing updates
2017-09-30 07:23:35 -05:00
Jordan Brown e5ef3d2405 Configuration datum refactor 2017-09-28 21:37:53 -05:00
CitadelStationBot 2d48a0cf50 [MIRROR] Makes borg modules and human species easily spawnable by admins from the mob spawn menu. (#2967)
* Makes borg modules and human species easily spawnable by admins from the mob spawn menu.

* Makes borg modules and human species easily spawnable by admins from the mob spawn menu.
2017-09-28 05:59:57 -07:00
LetterJay d8de375ada Merge pull request #2936 from Citadel-Station-13/upstream-merge-30969
[MIRROR] DisplayTimeText mk2
2017-09-27 23:39:03 -04:00
LetterJay 4f85246e42 Update robot_modules.dm 2017-09-27 18:42:06 -05:00
LetterJay 35761abdc8 Update robot_modules.dm 2017-09-27 18:40:46 -05:00
LetterJay 574ae23e51 Update robot_modules.dm 2017-09-27 17:58:32 -05:00
LetterJay 6818a3f5c9 Update robot_modules.dm 2017-09-27 17:36:14 -05:00
Ashe Higgs e575bd6685 (Ready) Clockwork Cult Rework: Proof-of-concept 2017-09-26 15:22:09 -05:00
ShizCalev 169aa85d9c DisplayTimeText mk2 2017-09-24 18:59:57 -05:00
KorPhaeron 31f6898a87 Stops AIs from giving the borg a free secondary light (#30913)
* Stops AIs from giving the borg a free secondary light

* Using a camera var now

* Wrong if

* My brain is not working
2017-09-24 17:58:37 -05:00
LetterJay cddcd82840 Update login.dm 2017-09-23 13:52:29 -05:00
Robustin 894673ef97 Fixes revolutionary deconversion messages and logging 2017-09-23 11:07:05 -05:00
CitadelStationBot a286d0c313 [MIRROR] Gives engineering cyborgs an item they can use in place of circuits for basic construction (#2875)
* Gives engineering cyborgs an item they can use in place of circuits for basic construction

* fixes
2017-09-22 23:35:54 -05:00
CitadelStationBot 2c78f7122c [MIRROR] Adds some new plushies (#2866)
* Adds some new plushies

* Update packs.dm
2017-09-22 22:31:07 -05:00
LetterJay c1a3dc1c1e Update cameranet.dm 2017-09-21 06:33:36 -05:00
oranges 41277ff110 Removes old debug text 2017-09-21 06:30:11 -05:00
CitadelStationBot d8a1fc936e [MIRROR] Stops AIs from taking actions while depowered (#2813)
* Stops AIs from taking actions while depowered

* Update ai.dm
2017-09-18 01:45:59 -05:00
CitadelStationBot 680e9e9697 [MIRROR] Quick pAI software buying tweak (#2825)
* Added the thing that Cruix wanted

* Quick pAI software buying tweak

* Update software.dm
2017-09-17 22:59:33 -05:00
Poojawa dd4f68dfee Cleans up .rej spam and the empty file from #2792 (#2818)
* Cleans up .rej spam and the empty file from #2792

* Update tgstation.dme
2017-09-17 11:56:55 -05:00
CitadelStationBot 35fc9d0391 [MIRROR] Fixes pAI integrated light (#2764)
* Fixes pAI integrated light (#30690)

* Fixes pAI integrated light
2017-09-14 13:22:27 -05:00
CitadelStationBot e4db027692 [MIRROR] Fixes to more Initialize procs (#2733)
* Fixes to more Initialize procs

* Update ai_monitored.dm

* Update cleanable.dm

* Update instruments.dm

* Update musician.dm

* Update noticeboard.dm

* Update mimic.dm

* Update interactive.dm
2017-09-13 22:54:12 -05:00
LetterJay a960b63b0a Merge branch 'master' into upstream-merge-30056 2017-09-13 06:08:59 -05:00