shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
934 Commits 5 Branches 0 Tags
ef2bce934280f829d2b11525c19fbb3014ffa171
Commit Graph

197 Commits

Author SHA1 Message Date
CitadelStationBot
870ee9ca6c Minor IV/bloodbag grammar fixes 2017-04-27 09:21:57 -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
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
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
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
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
417b80bb42 Merge pull request #516 from Verkister/master 
Bringing back the dogborgos.
 2017-04-26 06:24:26 -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
13ab996a1e Rod Form now costs 3 points 2017-04-25 23:13:42 -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
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
16c4f0da66 Merge pull request #563 from Citadel-Station-13/upstream-merge-26420 
[MIRROR] Dance Machine ~Fixes~
 2017-04-25 20:36:43 -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
LetterJay
b8ed1fc43e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-04-25 20:27:20 -05:00
LetterJay
fd26d0eccd Merge pull request #555 from Citadel-Station-13/upstream-merge-26501 
[MIRROR] Small abductors refactor
 2017-04-25 20:10:20 -05:00
CitadelStationBot
fc0ff20e75 Dance Machine ~Fixes~ 2017-04-25 15:14:54 -05:00
CitadelStationBot
d8a3294686 Refactors T-Ray Scanners 2017-04-25 14:30:08 -05:00
CitadelStationBot
5fde47917d Examining a window gives tips for construction/deconstruction 2017-04-25 09:39:30 -05:00
CitadelStationBot
fb61c31470 Small abductors refactor 2017-04-25 03:59:08 -05:00
CitadelStationBot
d931e5801c A bunch of Initialize()s now have return values 2017-04-25 03:51:57 -05:00
CitadelStationBot
8e4c9f69d6 Fixes flashlight eyes 2017-04-25 03:50:52 -05:00
CitadelStationBot
607868a5de [s]Exploit whack-a-mole 2017-04-25 01:31:50 -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
LetterJay
e27c5c8db3 Merge pull request #545 from Citadel-Station-13/upstream-merge-26397 
[MIRROR] Fixes easter eggs spawning during non-easter; SSevent now inits before SSticker
 2017-04-25 01:02:38 -05:00
LetterJay
176c11b8ea Merge pull request #544 from Citadel-Station-13/upstream-merge-26457 
[MIRROR] Doors crushing people makes a visible message
 2017-04-24 21:22:12 -05:00
CitadelStationBot
4baa357739 Fixes easter eggs spawning during non-easter; SSevent now inits before SSticker 2017-04-24 18:07:12 -05:00
LetterJay
7f44459847 Merge pull request #541 from Citadel-Station-13/upstream-merge-26400 
[MIRROR] Fixes bugs with shuttles breaking pipes, wires and disposals
 2017-04-24 18:03:34 -05:00
CitadelStationBot
5ed06c2e63 Doors crushing people makes a visible message 2017-04-24 18:02:03 -05:00
CitadelStationBot
3afe339198 Fixes bugs with shuttles breaking pipes, wires and disposals 2017-04-24 17:43:37 -05:00
CitadelStationBot
3ebf5ab3bc Fixes objects being used on backpacks if they don't fit 2017-04-24 17:39:27 -05:00
LetterJay
a6f6317b51 Merge pull request #535 from Citadel-Station-13/upstream-merge-26478 
[MIRROR] Fixes linking of multiple comm equipment with same id.
 2017-04-24 16:49:35 -05:00
LetterJay
a3d21f045a Merge pull request #534 from Citadel-Station-13/upstream-merge-26490 
[MIRROR] Fixes template tank dispensers
 2017-04-24 16:49:18 -05:00
LetterJay
2c01d8b5d9 Merge pull request #532 from Citadel-Station-13/upstream-merge-26381 
[MIRROR] Adds examine tips to firedoor construction/deconstruction
 2017-04-24 16:48:18 -05:00
CitadelStationBot
2af5d315a0 Fixes linking of multiple comm equipment with same id. 2017-04-24 13:14:16 -05:00
CitadelStationBot
2c06134e42 Fixes template tank dispensers 2017-04-24 13:12:11 -05:00
CitadelStationBot
c545d4801e Adds examine tips to firedoor construction/deconstruction 2017-04-24 07:45:06 -05:00
CitadelStationBot
de50b582ae Braining/debraining fixes 2017-04-23 14:48:31 -05:00
CitadelStationBot
387caa518f Changed alternate appearances to /datum/atom_hud s 2017-04-23 13:26:08 -05:00
Poojawa
528279a13e post-edited sounds (#522) 2017-04-23 02:02:11 -05:00
CitadelStationBot
682a00b768 Greyscale lighters no longer color the flame (#517) 2017-04-23 01:35:43 -05:00
Verkister
d66e609d48 Bringing back the dogborgos. 
-Also replaced the offset breaking forth-reset attack anim with forth-back as I did last time.
-Dogborg pounce is currently broken and slapping people with hud icons may be harmful for immursions.
-No Borgi yet because I can't be arsed to readd the whole sprite set this tired.
 2017-04-23 02:36:31 +03:00
LetterJay
47f078ee2b Merge pull request #514 from Citadel-Station-13/upstream-merge-26332 
[MIRROR] Heinious spawn
 2017-04-22 14:40:10 -05:00