Commit Graph

934 Commits

Author SHA1 Message Date
LetterJay
ef2bce9342 Merge pull request #599 from Citadel-Station-13/upstream-merge-26583
[MIRROR] Makes the GLOB stat_entry more indicative that you can edit it
2017-04-27 12:48:10 -05:00
LetterJay
dcf1c72cfc Merge pull request #601 from Citadel-Station-13/upstream-merge-26557
[MIRROR] Minor IV/bloodbag grammar fixes
2017-04-27 12:47:50 -05:00
LetterJay
0ebbadbe6c Merge pull request #603 from Citadel-Station-13/upstream-merge-26581
[MIRROR] Small fix
2017-04-27 12:47:18 -05:00
LetterJay
d7a338932a Merge pull request #600 from Citadel-Station-13/upstream-merge-26548
[MIRROR] Fixes map rotation with disabled voting
2017-04-27 12:47:02 -05:00
CitadelStationBot
3d30d6d40c Automatic changelog generation for PR #604 [ci skip] 2017-04-27 12:04:48 -05:00
LetterJay
bdc09d9620 Merge pull request #604 from LetterJay/Species_Layers
Fix for incorrect/missing extra layers
2017-04-27 12:04:47 -05:00
LetterJay
19b2723aa5 tweak 2017-04-27 11:48:46 -05:00
LetterJay
3103167a87 more expensive way to render, but MA isn't working or I'm overlooking something 2017-04-27 11:46:24 -05:00
CitadelStationBot
1f2c0e898e Small fix 2017-04-27 09:36:25 -05:00
CitadelStationBot
870ee9ca6c Minor IV/bloodbag grammar fixes 2017-04-27 09:21:57 -05:00
CitadelStationBot
0d58175118 Fixes map rotation with disabled voting 2017-04-27 09:20:53 -05:00
CitadelStationBot
3988f25647 Makes the GLOB stat_entry more indicative that you can edit it 2017-04-27 09:18:48 -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
CitadelStationBot
87ce25df9b Removes a unused chem (#576) 2017-04-26 11:09:00 -05:00
CitadelStationBot
ec2da50fbc Automatic changelog generation for PR #536 [ci skip] 2017-04-26 11:08:31 -05:00
CitadelStationBot
3d2f91d0c7 Removes a lavaland_surface_ww_vault.dmm because its just bad. (#536) 2017-04-26 11:08:30 -05:00
Poojawa
8ec4cbbb9f Fixes carelessness. (#577)
* Update hud.dm

* Delete hud.dm.rej

* Update alternate_appearance.dm

* Delete alternate_appearance.dm.rej

* Delete mob.dm.rej

* Update mob.dm
2017-04-26 10:37:57 -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
c5eeb2de67 Revert "Ghosts call Moved() after Move() (#26183)" (#510) 2017-04-26 10:11:47 -05:00
CitadelStationBot
8ff4d2bb9a Automatic changelog generation for PR #571 [ci skip] 2017-04-26 10:11:34 -05:00
CitadelStationBot
b1d6b6a277 [MIRROR] Drake swooping is smoother and more dangerous (#571)
* Drake swooping is smoother and more dangerous

* Update dragon.dm

* Delete dragon.dm.rej
2017-04-26 10:11:33 -05:00
CitadelStationBot
4cf23d086a Fixed nulls in the active_alternate_appearances list (#568) 2017-04-26 10:11:22 -05:00
CitadelStationBot
f881683902 Fixes windows going invisible (#567) 2017-04-26 10:11:11 -05:00
CitadelStationBot
e0e1fe2422 Automatic changelog generation for PR #513 [ci skip] 2017-04-26 09:52:36 -05:00
CitadelStationBot
84321916a5 Refactors ears into organs (#513)
* Refactors ear damage into ear organs

* Update human.dm

* Update species.dm

* Delete species.dm.rej

* Update tgstation.dme

* Delete tgstation.dme.rej

* Delete human.dm.rej

* Update tongue.dm

* Delete surgery.dmi

* upload fixed surgery.dmi
2017-04-26 09:52:35 -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
a8c4c86e1c REJ CLEANUP! 2017-04-26 06:48:41 -05:00
CitadelStationBot
a3af730e4e Automatic changelog generation for PR #574 [ci skip] 2017-04-26 06:45:11 -05:00
LetterJay
aa27e92afb Merge pull request #574 from Citadel-Station-13/upstream-merge-26474
[MIRROR] Gas injectors are now buildable
2017-04-26 06:45:09 -05:00
LetterJay
c65d02f001 Merge pull request #569 from Citadel-Station-13/upstream-merge-26537
[MIRROR] Rod Form now costs 3 points
2017-04-26 06:38:48 -05:00
LetterJay
8b31b86e0f manual merge 2017-04-26 06:38:01 -05:00
LetterJay
dbaca1843d Merge pull request #570 from Citadel-Station-13/upstream-merge-26539
[MIRROR] The blood loss change everyone's been raving about
2017-04-26 06:30:00 -05:00
LetterJay
417b80bb42 Merge pull request #516 from Verkister/master
Bringing back the dogborgos.
2017-04-26 06:24:26 -05:00
Verkister
265805afe6 Fixed dogborg pounce. 2017-04-26 13:27:36 +03:00
CitadelStationBot
38fa5ab9a1 Automatic changelog generation for PR #572 [ci skip] 2017-04-26 05:18:13 -05:00
LetterJay
5e3af2ce1e Merge pull request #572 from Citadel-Station-13/upstream-merge-26549
[MIRROR] Omega Station had two APCs not wired properly.
2017-04-26 05:18:12 -05:00
LetterJay
9ce99b1867 Merge pull request #573 from Citadel-Station-13/upstream-merge-26579
[MIRROR] Removes an unused var
2017-04-26 05:17:57 -05:00
CitadelStationBot
45e9b1644e Gas injectors are now buildable 2017-04-26 04:35:40 -05:00
CitadelStationBot
1542ac40c4 Removes an unused var 2017-04-25 23:33:13 -05:00
CitadelStationBot
c1fbb61977 Omega Station had two APCs not wired properly. 2017-04-25 23:33:10 -05:00
CitadelStationBot
5f09fa4de8 The blood loss change everyone's been raving about 2017-04-25 23:13:45 -05:00
CitadelStationBot
13ab996a1e Rod Form now costs 3 points 2017-04-25 23:13:42 -05:00
CitadelStationBot
e7b8733ead Automatic changelog generation for PR #561 [ci skip] 2017-04-25 22:29:58 -05:00
LetterJay
5d4afa23bc Merge pull request #561 from Citadel-Station-13/upstream-merge-25093
[MIRROR] Refactors T-Ray Scanners
2017-04-25 22:29:57 -05:00
LetterJay
b492fccffa removes rogue proc 2017-04-25 22:15:07 -05:00
LetterJay
df1bbddc9a Merge pull request #499 from TalkingCactus/let-the-bodies-hit-the-floor
Fixes Initializations
2017-04-25 22:03:32 -05:00
CitadelStationBot
e6a21eeca1 Automatic changelog generation for PR #531 [ci skip] 2017-04-25 22:00:27 -05:00
LetterJay
f70e00d8cd Merge pull request #531 from Citadel-Station-13/upstream-merge-26441
[MIRROR] Plasmamen tongues, plasmaman lung sprites
2017-04-25 22:00:26 -05:00
LetterJay
6b303ccecc /tg/ has tongues in their own file, maybe we should too? 2017-04-25 21:52:13 -05:00