LetterJay
bf26c247e0
Merge pull request #931 from Citadel-Station-13/upstream-merge-27167
...
[MIRROR] Ports dakimakuras from HippieStation.
2017-05-14 16:32:40 -04:00
LetterJay
d64e569d6c
Merge pull request #954 from Citadel-Station-13/upstream-merge-27199
...
[MIRROR] Free Golems can purchase their own royal capes
2017-05-14 16:27:25 -04:00
LetterJay
52fa1f314f
Merge branch 'master' into upstream-merge-26760
2017-05-14 01:02:26 -04:00
CitadelStationBot
73101cbd88
Free Golems can purchase their own royal capes
2017-05-13 21:17:37 -05:00
CitadelStationBot
474fd582ea
Ports dakimakuras from HippieStation.
2017-05-13 18:00:32 -05:00
CitadelStationBot
c506b6c7ce
Makes initial adamantine golem shells non-anchored and non-dense ( #856 )
2017-05-08 16:44:11 -07:00
CitadelStationBot
65729cdd55
[MIRROR] Fixes being unable to hit trophy cases in melee ( #844 )
...
* Fixes being unable to hit trophy cases in melee
* Update displaycase.dm
* Delete displaycase.dm.rej
* Update displaycase.dm
2017-05-08 00:31:54 -07:00
CitadelStationBot
9acc4da365
[MIRROR] Curator starts with the key to the display cases instead of being the key ( #763 )
...
* Curator starts with the key to the display cases instead of being the key
* Update displaycase.dm
* Delete displaycase.dm.rej
* Delete civilian.dm.rej
* Update civilian.dm
* fuck line endings
* define true/false
2017-05-08 00:25:59 -07:00
CitadelStationBot
e89bdb6422
[MIRROR] Fixes some stuff ( #768 )
...
* Fixes some stuff
* line fucking endings
2017-05-08 00:25:40 -07:00
kevinz000
335b6cde56
Merge branch 'master' into upstream-merge-26813
2017-05-07 22:31:16 -07:00
kevinz000
a87cee8a05
copy-paste-this-from-tg
2017-05-07 22:30:43 -07:00
kevinz000
68f7ea7fd0
handled rejects
2017-05-07 22:30:28 -07:00
kevinz000
2e0dd27978
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-26813
2017-05-07 22:28:00 -07:00
kevinz000
48d9e2e349
fixes rejects
2017-05-07 22:24:26 -07:00
kevinz000
5d2f131d07
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-26822
2017-05-07 22:22:24 -07:00
kevinz000
1168d06c9e
Merge pull request #759 from Citadel-Station-13/upstream-merge-26849
...
[MIRROR] New Tree Sprites
2017-05-06 21:25:06 -07:00
kevinz000
d1a8f643d6
Merge pull request #738 from Citadel-Station-13/upstream-merge-26774
...
[MIRROR] Fixes alien eggs
2017-05-06 13:59:33 -07:00
CitadelStationBot
4a142759a0
New Tree Sprites
2017-05-04 17:58:58 -05:00
LetterJay
d5ade71ea9
Merge pull request #706 from Citadel-Station-13/upstream-merge-26745
...
[MIRROR] Adds persistent trophy cases
2017-05-03 22:49:50 -05:00
CitadelStationBot
021f55a4d1
Fixes alien eggs
2017-05-03 22:22:26 -05:00
CitadelStationBot
33a93a611b
Curator Update
2017-05-03 22:22:12 -05:00
CitadelStationBot
ce302f4fe7
Trophy case hotfixes
2017-05-02 14:37:11 -05:00
CitadelStationBot
25f1b24f62
Makes golems able to transfer into empty shells
2017-05-02 10:00:33 -05:00
LetterJay
3b8484b52b
Merge pull request #579 from Citadel-Station-13/upstream-merge-26129
...
[MIRROR] Unorphans the blackbox
2017-05-02 05:13:49 -05:00
CitadelStationBot
036109de58
Changes a bunch of hrefs to the proper defines
2017-05-02 02:20:07 -05:00
CitadelStationBot
ea3ee7accc
Adds persistent trophy cases
2017-05-01 17:31:24 -05:00
LetterJay
06bfa8770e
Merge branch 'master' into upstream-merge-26129
2017-04-29 11:45:37 -05:00
CitadelStationBot
e1883354ba
Nerfs and buffs The Traps
2017-04-28 21:03:57 -05:00
LetterJay
a39b40d879
Merge pull request #578 from Citadel-Station-13/upstream-merge-25981
...
[MIRROR] Initialize Refactor
2017-04-28 09:29:00 -05:00
CitadelStationBot
caaf42815a
Changes some << to to_chat
2017-04-28 06:14:47 -05:00
CitadelStationBot
bde5d6253a
Unorphans the blackbox
2017-04-26 17:05:23 -05:00
CitadelStationBot
cea81a3357
Initialize Refactor
2017-04-26 16:03:17 -05:00
CitadelStationBot
e7df2bc14a
[MIRROR] Minor refactors ( #515 )
...
* Minor refactors
* Update client_procs.dm
* Delete client_procs.dm.rej
2017-04-26 11:13:41 -05:00
Poojawa
328ddaba1f
Delete window.dm.rej
2017-04-26 10:15:54 -05:00
Poojawa
bb97f09b74
Update window.dm
2017-04-26 10:15:44 -05:00
CitadelStationBot
f881683902
Fixes windows going invisible ( #567 )
2017-04-26 10:11:11 -05:00
CitadelStationBot
a905c15dad
Replaces /image with /mutable_appearance ( #556 )
...
* Replaces /image with /mutable_appearance, where appropriate
* Update miscellaneous.dm
* Delete miscellaneous.dm.rej
* Delete pet.dm.rej
* Update pet.dm
* Update species.dm
* Update miscellaneous.dm
* Update species.dm
* Update miscellaneous.dm
* Delete species.dm.rej
* Update species.dm
pretty sure I got all the indentation correct THIS time, ffs
* Update species.dm
* Update species.dm
fucking tabs man, fucking tabs.
2017-04-26 08:18:35 -05:00
LetterJay
6dc70fc02f
Merge pull request #526 from Citadel-Station-13/upstream-merge-26289
...
[MIRROR] Changed alternate appearances to /datum/atom_hud s
2017-04-25 21:39:14 -05:00
LetterJay
5cf9268498
Merge pull request #559 from Citadel-Station-13/upstream-merge-26380
...
[MIRROR] Examining a window gives tips for construction/deconstruction
2017-04-25 20:35:14 -05:00
CitadelStationBot
5fde47917d
Examining a window gives tips for construction/deconstruction
2017-04-25 09:39:30 -05:00
CitadelStationBot
d931e5801c
A bunch of Initialize()s now have return values
2017-04-25 03:51:57 -05:00
LetterJay
a06c6a2994
Merge pull request #508 from Citadel-Station-13/upstream-merge-26337
...
[MIRROR] Refactors picture frames to use wall frames system
2017-04-25 01:10:40 -05:00
CitadelStationBot
2c06134e42
Fixes template tank dispensers
2017-04-24 13:12:11 -05:00
CitadelStationBot
387caa518f
Changed alternate appearances to /datum/atom_hud s
2017-04-23 13:26:08 -05:00
CitadelStationBot
05d8550771
Refactors picture frames to use wall frames system
2017-04-21 17:54:34 -05:00
CitadelStationBot
0d4a7f2888
Fixes showcases not initializing
2017-04-19 14:08:56 -05:00
CitadelStationBot
64068fc614
Proximity sensing refactor ( #425 )
2017-04-16 18:15:29 -04:00
Poojawa
9e72b1b8fd
/tg/ 4/14 ( #367 )
...
* outside code stuff
* defines, helpers, etc
* everything not module
* modules
* compiled fixes + missing sounds
2017-04-14 23:28:04 -05:00
Poojawa
7e9b96a00f
April sync ( #360 )
...
* Maps and things no code/icons
* helpers defines globalvars
* Onclick world.dm orphaned_procs
* subsystems
Round vote and shuttle autocall done here too
* datums
* Game folder
* Admin - chatter modules
* clothing - mining
* modular computers - zambies
* client
* mob level 1
* mob stage 2 + simple_animal
* silicons n brains
* mob stage 3 + Alien/Monkey
* human mobs
* icons updated
* some sounds
* emitter y u no commit
* update tgstation.dme
* compile fixes
* travis fixes
Also removes Fast digest mode, because reasons.
* tweaks for travis Mentors are broke again
Also fixes Sizeray guns
* oxygen loss fix for vore code.
* removes unused code
* some code updates
* bulk fixes
* further fixes
* outside things
* whoops.
* Maint bar ported
* GLOBs.
2017-04-13 23:37:00 -05:00
ktccd
1a5ec9c3a2
Captain's Laser accessible by captain ( #324 )
...
Changes the access required from centcomm special ops to captain access.
Comment says it was on purpose, but seems poorly explained. As it is, a
lot of people don't seem to know display cases even CAN be opened. And
the gun is the captain's, why would it need special ops access to
retrieve?
2017-04-02 13:03:42 -04:00
