6bfba3ea03
Update lizardpeople.dm
2017-11-22 17:50:23 -05:00
93a2d653bf
Update humans.dm
2017-11-22 17:48:56 -05:00
3f07d95b56
Update corporate.dm
2017-11-22 17:46:40 -05:00
fc2a0f48fa
Update DNA.dm
2017-11-22 17:45:15 -05:00
783960a986
Divides species in subtypes, makes viruses able to infect certain subtypes
2017-11-22 15:36:43 -06:00
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
626cc30a84
Automatic changelog generation for PR #4059 [ci skip]
2017-11-22 14:50:01 -06:00
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
b90b18cc27
recompiles tgui
2017-11-22 15:38:43 -05:00
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
c3cf47dd5c
Automatic changelog generation for PR #4060 [ci skip]
2017-11-22 13:57:22 -06:00
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
3b1067ba7a
Update pants.dm
2017-11-22 14:56:26 -05:00
c5adadc5d1
Update engineering.dm
2017-11-22 14:54:01 -05:00
5d2c5add1f
Update color.dm
2017-11-22 14:50:37 -05:00
b24c9335b3
Update jobs.dm
2017-11-22 14:48:35 -05:00
5e6e725666
Update color.dm
2017-11-22 14:47:15 -05:00
2dbe3e3b82
Update chameleon.dm
2017-11-22 14:46:06 -05:00
d86bdf2150
Update trash.dm
2017-11-22 14:44:09 -05:00
166087190c
Automatic changelog generation for PR #4069 [ci skip]
2017-11-22 13:42:05 -06:00
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
978d495196
Automatic changelog generation for PR #4067 [ci skip]
2017-11-22 13:41:31 -06:00
c696ba46b0
Merge pull request #4067 from Citadel-Station-13/upstream-merge-32957
...
[MIRROR] Fixes space cat resting sprite
2017-11-22 19:41:28 +00:00
fb60ee1015
Automatic changelog generation for PR #4066 [ci skip]
2017-11-22 13:40:58 -06:00
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
293025e6c4
Automatic changelog generation for PR #4072 [ci skip]
2017-11-22 13:40:07 -06:00
8765daacfb
Merge pull request #4072 from Citadel-Station-13/upstream-merge-32976
...
[MIRROR] Adds round ID to status world topic
2017-11-22 19:40:04 +00:00
3b063a3822
Merge pull request #4070 from Citadel-Station-13/upstream-merge-32973
...
[MIRROR] Updates README.MD to correct a file name.
2017-11-22 19:39:35 +00:00
b925c0e265
Update server.dm
2017-11-22 14:20:45 -05:00
b139e6b075
Adds round ID to status world topic
2017-11-22 12:41:44 -06:00
06b86e54b3
Adds round ID to status topic ( #32976 )
2017-11-22 12:41:44 -06:00
6ab499b57b
Fixes bartender suit having an adjust state
2017-11-22 12:40:32 -06:00
ab5ad20eb8
Updates README.MD to correct a file name.
2017-11-22 12:39:20 -06:00
d3e5a40462
licensing meme ( #32973 )
2017-11-22 12:39:20 -06:00
16094ab909
ahelp command can now accept a ticket #
2017-11-22 12:38:07 -06:00
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
04cc679964
Fixes space cat resting sprite
2017-11-22 10:47:30 -06:00
f22841d2fe
Fixes space cat resting sprite
2017-11-22 10:47:30 -06:00
0008da671a
Refactor chasm paths to be more sane
2017-11-22 03:30:49 -06:00
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
dc0128a6d3
Merge pull request #4058 from Citadel-Station-13/upstream-merge-32954
...
[MIRROR] Fixes blobbernaut spawning
2017-11-22 06:00:58 +00:00
6fae70f9a2
Merge pull request #4061 from Citadel-Station-13/upstream-merge-32941
...
[MIRROR] Attempt 2 at getting licensing detection to work
2017-11-22 05:59:48 +00:00
fc5133bef5
Merge pull request #4062 from Citadel-Station-13/upstream-merge-32932
...
[MIRROR] Cleans up template shuttles
2017-11-22 05:57:35 +00:00
a318958810
Merge pull request #4063 from Citadel-Station-13/upstream-merge-32933
...
[MIRROR] Stacked turf cleanup
2017-11-22 05:57:05 +00:00
f830a2e9b5
Automatic changelog generation for PR #4064 [ci skip]
2017-11-21 23:56:10 -06:00
9e93007fb0
Merge pull request #4064 from Citadel-Station-13/upstream-merge-32951
...
[MIRROR] Conjuration spells fix
2017-11-22 05:56:07 +00:00
ef84419608
Conjuration spells fix
2017-11-21 22:30:05 -06:00
cf10130b21
Conjuration spells fix ( #32951 )
...
* conjure spells fix
* added newline at end of file
2017-11-21 22:30:05 -06:00
d6584d57bd
Stacked turf cleanup
2017-11-21 22:28:48 -06:00
8a83b50113
Stacked turf cleanup ( #32933 )
2017-11-21 22:28:48 -06:00
deathride58