7ca4a29cac
Merge pull request #4354 from Citadel-Station-13/upstream-merge-33465
...
[MIRROR] Replaces a bunch of loc assignments with forcemoves and moves to nullspace
2017-12-14 03:54:31 +00:00
7f90427a40
Replaces a bunch of loc assignments with forcemoves and moves to nullspace
2017-12-13 13:56:57 -06:00
129cd705d1
Correctly set description of nonstandard cells
2017-12-13 09:12:55 -06:00
a17e7ae3cf
Merge pull request #4283 from Citadel-Station-13/upstream-merge-33358
...
[MIRROR] Replace pAI verb tab with an action button
2017-12-10 03:11:54 +00:00
0a71554d7f
Replace pAI verb tab with an action button ( #33358 )
...
pAI suicide is now standardized with other suicides. The Software
Interface verb has been changed to an action button. This eliminates the
need for a verb tab for only two verbs.
2017-12-08 22:46:30 -06:00
742d50b5e7
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization
...
# Conflicts:
# code/citadel/custom_loadout/custom_items.dm
# code/datums/components/riding.dm
# code/game/objects/items/implants/implantuplink.dm
# icons/mob/neck.dmi
# icons/obj/clothing/cloaks.dmi
2017-12-08 19:58:41 -05:00
53ab4feb2f
Merge pull request #4270 from Citadel-Station-13/upstream-merge-33324
...
[MIRROR] [Ready] Makes the default view range a config option (Allows hosts to enable widescreen)
2017-12-08 18:47:56 +00:00
17bb149cd1
Fixes observer versions of sillicon chat ( #33355 )
2017-12-08 12:07:01 -06:00
8b9e15d1b5
Merge pull request #33324 from deathride58/foreignfurryaddswidescreen
...
[Ready] Makes the default view range a config option (Allows hosts to enable widescreen)
2017-12-08 10:35:23 -06:00
4b6660814a
Makes sillicon chat more visible ( #33222 )
...
Made it green on black
Forgot to remove it at the bold thingy
2017-12-06 06:20:27 -06:00
f57e02ce95
Merge branch 'master' into donoritemmodularization
2017-12-04 20:17:02 -05:00
379f73d1e1
Merge branch 'master' into upstream-merge-32249
2017-12-04 23:15:38 +00:00
40cf3ab656
Update robot_movement.dm
2017-12-04 16:22:24 -05:00
66c66f0bd7
[READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on
2017-12-03 15:33:29 -06:00
29ba71765c
Datumizes saymodes
2017-12-03 12:56:03 -06:00
b23c92b056
Added bot path data huds
2017-11-28 06:28:40 -06:00
5abd1bcdd9
Cleans up some qdel(src)'s in Initialize()
2017-11-26 20:15:18 -06:00
ceee0c80e7
okay ( #33058 )
2017-11-24 22:39:44 -06:00
1f6b3ce629
Merge branch 'master' into upstream-merge-32188
2017-11-21 19:53:58 +00:00
15165d970d
Update inventory.dm
2017-11-20 22:29:55 -05:00
3aefa4a907
Update cameranet.dm
2017-11-20 22:29:15 -05:00
2498e1ddc0
Cleans up unused code
2017-11-20 10:14:32 -06:00
eeba86e27e
Merge branch 'master' into upstream-merge-32188
2017-11-18 05:31:42 +00:00
591efe27a3
Update robot_modules.dm
2017-11-18 00:19:35 -05:00
b7e99a7448
JSON feedback
2017-11-17 01:44:12 -06:00
6ce69fb2c8
Replaces a bunch of mob loops with hopefully better ones
2017-11-16 16:09:15 -06:00
809951c56c
Merge pull request #3326 from Citadel-Station-13/upstream-merge-31176
...
[MIRROR] loc -- > forcemove
2017-11-14 15:58:20 -06:00
6286f4d4c2
Merge branch 'master' into upstream-merge-32161
2017-11-11 23:02:13 -06:00
d6e5942baf
Merge branch 'master' into upstream-merge-31176
2017-11-09 03:24:38 -06:00
9c12ee48e1
Adds an organ storage bag to the syndicate medborg ( #32437 )
...
* Adds an organ storage bag to the syndicate medborg
* Adds the drill and extinguisher
2017-11-06 15:15:10 -06:00
4b297f509e
512 forward compatibility merge
2017-10-29 10:28:36 -05:00
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
c51edc3bcd
Removes duplicate typecaches
2017-10-23 08:25:30 -05:00
bc5c548e9b
Merge pull request #31989 from ninjanomnom/radiation-borg-fix
...
Fixes silicon mob contents becoming contaminated
2017-10-21 22:22:01 -05:00
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
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
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
d04818e6f9
Fixes AI visiblity checks ( #31819 )
2017-10-19 05:42:52 -05:00
5ad2b5d866
Merge pull request #31830 from ShizCalev/geiger-borg
...
Gives engi borgs geiger counters
2017-10-18 07:24:53 -05:00
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
2ecb4c216c
Datum rev & related upgrades to base datum antag
2017-10-18 02:26:11 -05:00
b643de63f5
Removes toggle camera light verb ( #31821 )
2017-10-17 23:18:52 -05:00
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
e72d36c381
Merge pull request #3406 from deathride58/heavysechoundnerfs
...
INTENSE BORGO BALANCE CHANGES
2017-10-15 10:23:37 -04:00
47195cdbf0
INTENSE BORGO BALANCE TWEAKS
2017-10-15 00:30:22 -04:00
b20e5916ea
Removes a bunch of sleeps/spawns and makes a few booleans defines
2017-10-14 18:53:48 -05:00
bd7a0d65b5
Fix many instances of "the the"
2017-10-13 09:41:54 -05:00
00606b9303
Fix lavaland turfs looking awkward to AIs ( #31554 )
2017-10-12 10:40:38 -05:00
033d14e8b3
loc -- > forcemove
2017-10-12 06:13:11 -05:00
b0c833059e
Update chunk.dm
2017-10-10 04:40:26 -05:00
deathride58