Commit Graph

2513 Commits

Author SHA1 Message Date
CitadelStationBot
2c09a344b7 [MIRROR] Fixes windows not returning an Initialize hint (#1902)
* Fixes windows not returning an Initialize hint

* Update window.dm

* Delete window.dm.rej
2017-07-06 14:15:30 -05:00
CitadelStationBot
2da7322cca [MIRROR] Gives ghost roles their own assigned_roles (#1887)
* Gives ghost roles their own assigned_roles

* Update ghost_role_spawners.dm

* Delete ghost_role_spawners.dm.rej
2017-07-06 14:15:12 -05:00
CitadelStationBot
24e0c88263 Removes the hot variants of necropolis tiles and walls (#1885) 2017-07-06 13:20:38 -05:00
LetterJay
db9b069075 re-adds headpatting (#1903) 2017-07-06 10:29:58 -07:00
LetterJay
dd70580a72 Merge pull request #1901 from Citadel-Station-13/upstream-merge-28992
[MIRROR] Adds Necropolis curses for cursed items in Necropolis ruins
2017-07-06 11:22:24 -05:00
LetterJay
c62086af13 Merge pull request #1900 from Citadel-Station-13/upstream-merge-28877
[MIRROR] Makes pulsing the AI wire of a borg offer the user the option to change it and properly notifies the AI when it is cut.
2017-07-06 10:56:52 -05:00
LetterJay
76c6b0b854 Merge pull request #1899 from Citadel-Station-13/upstream-merge-29052
[MIRROR] Increases freedom of the freedom suit
2017-07-06 10:52:20 -05:00
LetterJay
223c95940d Merge pull request #1898 from Citadel-Station-13/upstream-merge-29008
[MIRROR] Cleans up posibrain code
2017-07-06 10:52:06 -05:00
LetterJay
67194851a8 Merge pull request #1897 from Citadel-Station-13/upstream-merge-29032
[MIRROR] Tweaks the blood-drunk miner
2017-07-06 10:51:39 -05:00
CitadelStationBot
4796ede787 Adds Necropolis curses for cursed items in Necropolis ruins 2017-07-06 10:15:09 -05:00
LetterJay
01611a1c9f Merge pull request #1896 from Citadel-Station-13/upstream-merge-29030
[MIRROR] Removes the need for specifying obj_integrity
2017-07-06 10:04:37 -05:00
LetterJay
e9664c734e Merge pull request #1895 from Citadel-Station-13/upstream-merge-28942
[MIRROR] Fixes being unable to dig plants out of soil
2017-07-06 10:04:17 -05:00
LetterJay
69dea00ba6 Merge pull request #1894 from Citadel-Station-13/upstream-merge-28958
[MIRROR] Replaces all instances of spawn() with addtimer/INVOKE_ASYNC
2017-07-06 10:04:01 -05:00
LetterJay
2acbe52a9d Merge pull request #1893 from Citadel-Station-13/upstream-merge-29050
[MIRROR] Fixes plasma window sprite
2017-07-06 10:03:31 -05:00
LetterJay
652c641b04 Merge pull request #1892 from Citadel-Station-13/upstream-merge-29051
[MIRROR] Replaces highpressure windows with plasma windows
2017-07-06 10:03:11 -05:00
CitadelStationBot
9c5b764058 Makes pulsing the AI wire of a borg offer the user the option to change it and properly notifies the AI when it is cut. 2017-07-06 09:53:35 -05:00
CitadelStationBot
80083bed73 Increases freedom of the freedom suit 2017-07-06 09:46:23 -05:00
CitadelStationBot
eb7f6c515b Cleans up posibrain code 2017-07-06 09:43:16 -05:00
CitadelStationBot
b555dce39f Tweaks the blood-drunk miner 2017-07-06 09:40:05 -05:00
LetterJay
2871a73236 Merge pull request #1891 from Citadel-Station-13/upstream-merge-29043
[MIRROR] Fixes holodeck not having the correct area
2017-07-06 09:27:01 -05:00
LetterJay
97b9b87f58 Merge pull request #1890 from Citadel-Station-13/upstream-merge-28989
[MIRROR] Fixes cartridges not linking with their host PDAs on creation
2017-07-06 09:26:40 -05:00
LetterJay
1471cbe936 Merge pull request #1889 from Citadel-Station-13/upstream-merge-29036
[MIRROR] Fixes heartbeat sounds playing indefinitely in certain cases
2017-07-06 09:25:11 -05:00
LetterJay
f829b90cb2 Merge pull request #1888 from Citadel-Station-13/upstream-merge-29039
[MIRROR] Fixes the legion door admin report/logging
2017-07-06 09:24:49 -05:00
CitadelStationBot
d859f05d5c Removes the need for specifying obj_integrity 2017-07-06 09:24:27 -05:00
CitadelStationBot
fa37fcd12b Fixes being unable to dig plants out of soil 2017-07-06 09:15:09 -05:00
CitadelStationBot
beccb4742f Replaces all instances of spawn() with addtimer/INVOKE_ASYNC 2017-07-06 09:14:03 -05:00
CitadelStationBot
44dd423642 Fixes plasma window sprite 2017-07-06 09:11:55 -05:00
CitadelStationBot
75fe249947 Replaces highpressure windows with plasma windows 2017-07-06 09:11:50 -05:00
CitadelStationBot
10e85b488f Fixes holodeck not having the correct area 2017-07-06 09:09:43 -05:00
CitadelStationBot
cdb3158af5 Fixes cartridges not linking with their host PDAs on creation 2017-07-06 09:06:29 -05:00
CitadelStationBot
21878a77f0 Fixes heartbeat sounds playing indefinitely in certain cases 2017-07-06 08:26:23 -05:00
CitadelStationBot
431d8050aa Fixes the legion door admin report/logging 2017-07-06 08:26:19 -05:00
CitadelStationBot
6c0926f062 Fixes forced two-handed weapons being unstorable 2017-07-06 08:26:00 -05:00
Poojawa
b1b4826c0c July 5th TG sync (#1883)
July 5th TG sync
2017-07-05 22:14:19 -05:00
Poojawa
36a1898bde Dogborg balance tweaks (#1805)
* Update dogborgstuff.dm

* Compile fixes

* minor code standards tweaks
2017-07-05 10:01:57 -05:00
CitadelStationBot
a1ff07ed1f [MIRROR] Organs for catgirls (#1457)
* Organs for catgirls

* Delete tgstation.dme.rej

* Update tgstation.dme
2017-07-05 09:12:59 -05:00
CitadelStationBot
7300c2572e [MIRROR] Fixes #28082 : Private Security cutouts have icons. (#1431)
* Fixes #28082 : Private Security cutouts have icons.

* Create cardboard_cutouts.dm

* Update cardboard_cutouts.dm

* Delete cardboard_cutouts.dm.rej
2017-07-05 08:44:07 -05:00
CitadelStationBot
509b9562d3 Gives AI radios loudmode (#1875) 2017-07-04 19:52:35 -07:00
CitadelStationBot
45fd6a1447 Fixes PDA runtime href exploit (#1868) 2017-07-04 15:47:06 -07:00
LetterJay
b75fee9f38 Merge branch 'master' into upstream-merge-28711 2017-07-03 17:47:00 -05:00
LetterJay
1054100178 Merge pull request #1447 from Citadel-Station-13/upstream-merge-28108
[MIRROR] Renamed Volt Void to Volt Blaster and removed it consuming and scaling with power
2017-07-03 17:46:37 -05:00
kevinz000
6e2bd5fef5 Update click.dm 2017-07-03 15:45:19 -07:00
LetterJay
cc3b59d9b0 Merge pull request #1866 from Citadel-Station-13/upstream-merge-28988
[MIRROR] Fixes pods not counting as escape
2017-07-03 17:38:04 -05:00
CitadelStationBot
f02411ad9e [s] Makes cookie alert private (#1865) 2017-07-03 15:14:38 -07:00
CitadelStationBot
21ef6c18b3 Fixes pods not counting as escape 2017-07-03 17:14:27 -05:00
LetterJay
694bf7a641 Update clockwork_slab.dm 2017-07-03 14:09:59 -05:00
LetterJay
08fd496450 Update clockwork_slab.dm 2017-07-03 12:02:32 -05:00
CitadelStationBot
5882b25b7a Rewrites Recollection and splits it into categories, rewords Hierophant Network description 2017-07-03 10:10:17 -05:00
CitadelStationBot
793a2ce28f Grammar and message tweaks (#1722) 2017-07-01 21:22:29 -07:00
CitadelStationBot
82e8b54738 Mesons work on lavaland again (#1802) 2017-07-01 21:21:59 -07:00