LetterJay
eba36e48f9
Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188
...
[MIRROR] JSON feedback
2017-11-22 18:42:34 -06:00
deathride58
eeaa90a897
Merge pull request #4079 from Citadel-Station-13/upstream-merge-32945
...
[MIRROR] Fixes bad text2file call
2017-11-22 22:41:28 +00:00
oranges
2615ddd226
Merge pull request #32945 from tgstation/Cyberboss-patch-1
...
Fixes bad text2file call
2017-11-22 15:39:16 -06:00
oranges
7c1fe79635
Merge pull request #32943 from ShizCalev/alium-softcrit-sprite
...
Fixes aliums showing wrong sprite in softcrit
2017-11-22 15:37:57 -06:00
deathride58
2e9f3bc1c0
Merge pull request #4071 from Citadel-Station-13/upstream-merge-32968
...
[MIRROR] Fixes bartender suit having an adjust state
2017-11-22 20:50:45 +00:00
deathride58
bf6f920754
Merge pull request #4059 from Citadel-Station-13/upstream-merge-32944
...
[MIRROR] Update Turbine computer to use TGUI
2017-11-22 20:49:58 +00:00
deathride58
1ab94199d1
Merge pull request #4046 from Citadel-Station-13/kevinz000-patch-1
...
Makes magbullets that are non lethal not do brute damage
2017-11-22 20:00:44 +00:00
deathride58
5e43516925
Merge pull request #4060 from Citadel-Station-13/upstream-merge-32955
...
[MIRROR] Gives the R&D Server a description and makes its name improper
2017-11-22 19:57:19 +00:00
deathride58
3b1067ba7a
Update pants.dm
2017-11-22 14:56:26 -05:00
deathride58
c5adadc5d1
Update engineering.dm
2017-11-22 14:54:01 -05:00
deathride58
5d2c5add1f
Update color.dm
2017-11-22 14:50:37 -05:00
deathride58
b24c9335b3
Update jobs.dm
2017-11-22 14:48:35 -05:00
deathride58
5e6e725666
Update color.dm
2017-11-22 14:47:15 -05:00
deathride58
2dbe3e3b82
Update chameleon.dm
2017-11-22 14:46:06 -05:00
deathride58
d86bdf2150
Update trash.dm
2017-11-22 14:44:09 -05:00
deathride58
7bc195c055
Merge pull request #4069 from Citadel-Station-13/upstream-merge-32970
...
[MIRROR] `ahelp` command can now accept a ticket #
2017-11-22 19:42:02 +00:00
deathride58
11ecf4d922
Merge pull request #4066 from Citadel-Station-13/upstream-merge-32701
...
[MIRROR] Refactor chasm paths to be more sane
2017-11-22 19:40:55 +00:00
deathride58
889defd2ce
Update _event.dm
2017-11-22 14:29:13 -05:00
deathride58
8efbcc9cb0
Update time_track.dm
2017-11-22 14:28:25 -05:00
deathride58
2934effd36
Update blackbox.dm
2017-11-22 14:27:10 -05:00
deathride58
b925c0e265
Update server.dm
2017-11-22 14:20:45 -05:00
Shadowlight213
06b86e54b3
Adds round ID to status topic ( #32976 )
2017-11-22 12:41:44 -06:00
ShizCalev
6ab499b57b
Fixes bartender suit having an adjust state
2017-11-22 12:40:32 -06:00
Jordan Brown
5468bcc56f
ahelp command can now accept a ticket # (#32970 )
...
* `ahelp` command can now accept a ticket #
As opposed to only a ckey
* Fix bad invocation of TicketByID()
* Use correct ahelp typepath
2017-11-22 12:38:07 -06:00
Tad Hardesty
38c45fb479
Refactor chasm paths to be more sane ( #32701 )
...
In addition, makes chasm handling a component, so it could be reused for
chasm-likes which are not quite chasms.
Also fixes a couple of bugs relating to building on top of chasms
occasionally erasing the chasm.
2017-11-22 03:30:49 -06:00
deathride58
dc0128a6d3
Merge pull request #4058 from Citadel-Station-13/upstream-merge-32954
...
[MIRROR] Fixes blobbernaut spawning
2017-11-22 06:00:58 +00:00
jammer312
cf10130b21
Conjuration spells fix ( #32951 )
...
* conjure spells fix
* added newline at end of file
2017-11-21 22:30:05 -06:00
Y0SH1M4S73R
61ae95da33
Gives the R&D Server a description and makes its name improper
2017-11-21 22:28:23 -06:00
Matt Smith
694958f587
Update Turbine computer to use TGUI
2017-11-21 22:28:14 -06:00
KorPhaeron
ddddac262e
Fixes blobbernaut spawning ( #32954 )
...
* Fixes blobbernaut spawning
* There is no mob yet, we can't poll for it
2017-11-21 22:27:49 -06:00
deathride58
0f9a85e4d7
Merge pull request #3747 from Citadel-Station-13/upstream-merge-32101
...
[MIRROR] Refactor of catpeople mutant organs
2017-11-21 21:16:31 +00:00
deathride58
aedf16a76e
merges #4011
2017-11-21 15:07:31 -05:00
deathride58
51a7c4a543
Merge pull request #4057 from deathride58/manualmirrors2
...
Manually mirrors #32838 and #32462 from upstream
2017-11-21 20:00:18 +00:00
deathride58
4b284f2e0d
Merge pull request #4051 from Citadel-Station-13/upstream-merge-32773
...
[MIRROR] Integrated circuit fixes and code improvements
2017-11-21 19:59:38 +00:00
deathride58
0feca054da
cleans up whitespace in traitor_bro.dm
2017-11-21 14:58:43 -05:00
deathride58
973be1b494
Update traitor_bro.dm
2017-11-21 14:56:41 -05:00
deathride58
1f6b3ce629
Merge branch 'master' into upstream-merge-32188
2017-11-21 19:53:58 +00:00
deathride58
c2b27ebfa4
merges #3837
2017-11-21 14:45:44 -05:00
deathride58
9f80325c52
Update power.dm
2017-11-21 14:20:03 -05:00
deathride58
e5cdbe29cc
Update printer.dm
2017-11-21 14:18:42 -05:00
deathride58
232be3da9f
Merge pull request #4052 from Citadel-Station-13/upstream-merge-32928
...
[MIRROR] Fixes humans missing legs moving slower in zero-g enviroments
2017-11-21 19:15:41 +00:00
deathride58
ddbb5c34d4
manual mirrors
2017-11-21 14:06:28 -05:00
Leo
f668f36156
Merge pull request #32928 from ShizCalev/space-leg-slowdown
...
Fixes humans missing legs moving slower in zero-g enviroments
2017-11-21 04:01:56 -06:00
ACCount
8a64287249
Integrated circuit fixes and code improvements
2017-11-21 03:04:17 -06:00
ShizCalev
35af5e49aa
Fixes computers deleting on build ( #32942 )
...
* Fixes computers deleting on build
* Removed src
2017-11-21 02:43:34 -06:00
deathride58
c1b344f08f
Merge pull request #4049 from Citadel-Station-13/upstream-merge-32860
...
[MIRROR] Cleans up floors.dmi a bit and adds new turf decals.
2017-11-21 06:42:22 +00:00
deathride58
2e210d08e1
Merge pull request #3639 from deathride58/IHAVENOIDEAWHATTHEFUCKIMDOING
...
[READY] Redtext bug fix + Endround objective check cleanup
2017-11-21 05:53:00 +00:00
deathride58
fc5badc8e3
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-32860
2017-11-20 23:50:52 -05:00
deathride58
2abd06e25e
Merge pull request #4028 from Citadel-Station-13/upstream-merge-32862
...
[MIRROR] Rat Kebabs
2017-11-21 04:39:41 +00:00
deathride58
4e727ee576
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-32860
...
# Conflicts:
# _maps/map_files/MetaStation/MetaStation.dmm
2017-11-20 23:34:46 -05:00
