Commit Graph

78 Commits

Author SHA1 Message Date
LetterJay
2d41b7fe17 EHHH 2017-05-28 15:49:22 -05:00
LetterJay
42edd006b8 A BUNCH OF SHIT 2017-05-28 14:57:17 -05:00
LetterJay
fcb3a53072 Merge pull request #1243 from Citadel-Station-13/upstream-merge-27725
[MIRROR] Changes incorporeal movement to use defines
2017-05-28 14:33:22 -05:00
LetterJay
33aae484d1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-05-27 22:49:44 -05:00
LetterJay
fdb54c3ce3 hat 2017-05-27 22:49:20 -05:00
CitadelStationBot
2cc74f4a8f Changes incorporeal movement to use defines 2017-05-27 20:55:04 -05:00
LetterJay
0137b79f6c Merge pull request #1195 from Citadel-Station-13/upstream-merge-27537
[MIRROR] Adds goliath cloak & a recipe (Lavaland PvE primitive item)
2017-05-26 23:22:31 -05:00
CitadelStationBot
b089a14c53 Ports guns to Initialize 2017-05-26 19:06:39 -05:00
CitadelStationBot
a84bcdd42e Adds goliath cloak & a recipe (Lavaland PvE primitive item) 2017-05-26 11:14:20 -05:00
CitadelStationBot
7d75b70ff0 Renames a var 2017-05-24 16:21:19 -05:00
LetterJay
936e1d3061 Missed during mirror downtime 2017-05-24 08:40:45 -05:00
CitadelStationBot
074b684b4d Armour Description Changes 2017-05-24 00:11:57 -05:00
CitadelStationBot
e6617661f9 Gives all hats a default icon/item state so they work with chameleon gear. 2017-05-23 07:58:48 -05:00
CitadelStationBot
6b4b6ee70d Mesons no longer show turfs on lavaland, but miners no longer need mesons to see minerals scanned by a mineral scanner through walls 2017-05-22 22:21:20 -05:00
LetterJay
ab50a3eca5 Merge pull request #1068 from Citadel-Station-13/upstream-merge-27283
[MIRROR] Decentralized and Vastly Improved Gang Influence System
2017-05-22 16:28:57 -05:00
CitadelStationBot
7df5632d6e Minor Grammar Fixes 2017-05-21 22:28:29 -05:00
CitadelStationBot
c39b60b3cf Decentralized and Vastly Improved Gang Influence System 2017-05-20 18:37:48 -05:00
CitadelStationBot
1b39381ee7 Ports radios to Initialize (#983) 2017-05-18 12:19:55 -05:00
CitadelStationBot
7a9e05e9d9 Cerestation Tweaks MK VII: BEES edition (#925) 2017-05-18 10:36:51 -05:00
CitadelStationBot
a317d23a51 [MIRROR] Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie (#916)
* Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie

* fixes .rej
2017-05-18 09:37:30 -05:00
CitadelStationBot
eb359f1014 [MIRROR] Cerestation Tweaks VI: Shuttle Edition (#876)
* Cerestation Tweaks VI: Shuttle Edition

* fix .rej
2017-05-18 06:51:26 -05:00
CitadelStationBot
8bcaa54cbe [MIRROR] Fixes language code ignoring holder restrictions (#858)
* Fixes language code ignoring holder restrictions

* resolve .rej file.
2017-05-18 04:13:57 -05:00
CitadelStationBot
257cf986c5 Repaths C4 (#808)
* Repaths C4

* Delete tgstation.2.1.3.dmm.rej

* Add files via upload

* update CitadelStation-1.2.1.dmm
2017-05-18 00:37:20 -05:00
LetterJay
a1c04dd314 Merge pull request #898 from LetterJay/master
Adds a hunter hat to the game/clothesmate
2017-05-12 16:24:17 -04:00
CitadelStationBot
2625269439 t-ray mode on goggles resets lighting (#885) 2017-05-10 16:05:55 -07:00
CitadelStationBot
5b2521dad4 Tweaks the curator's access and clothing to improve his treasure hunting ability (#882) 2017-05-10 16:05:33 -07:00
LetterJay
43dd22425b Citadel hat DMI/DM
Cleans up pointless files
2017-05-10 17:33:13 -05:00
CitadelStationBot
44c29c6193 Fixes clothing damage message (#831) 2017-05-08 16:44:38 -07:00
kevinz000
2e0dd27978 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-26813 2017-05-07 22:28:00 -07:00
CitadelStationBot
884338d048 Fixes being able to stand on chasms 2017-05-07 18:06:44 -05:00
CitadelStationBot
0639a54346 Hopefully makes flightsuit processing less taxing on the server 2017-05-04 06:01:53 -05:00
CitadelStationBot
33a93a611b Curator Update 2017-05-03 22:22:12 -05:00
LetterJay
6310292531 woo 2017-05-02 11:19:14 -05:00
LetterJay
2bef665038 Merge pull request #613 from Citadel-Station-13/upstream-merge-26563
[MIRROR] Renames generic armor and athletic shorts
2017-05-02 11:14:47 -05:00
LetterJay
8af590f075 Merge pull request #591 from Citadel-Station-13/upstream-merge-26601
[MIRROR] When jumpsuits take severe damage, their suit sensors break.
2017-05-02 11:10:13 -05:00
LetterJay
587043f1e8 pls 2017-05-02 09:44:19 -05:00
LetterJay
d7624b5824 Merge pull request #678 from Citadel-Station-13/upstream-merge-26663
[MIRROR] Buffs jump boot dash speed
2017-05-01 08:10:23 -05:00
CitadelStationBot
e4adf5d524 Buffs jump boot dash speed 2017-05-01 07:24:37 -05:00
CitadelStationBot
ed7a4f57b5 >unironically spelling unironically wrong 2017-04-28 10:02:16 -05:00
CitadelStationBot
caaf42815a Changes some << to to_chat 2017-04-28 06:14:47 -05:00
CitadelStationBot
4a2e1367b5 Renames generic armor and athletic shorts 2017-04-27 17:01:29 -05:00
CitadelStationBot
b45d053ac6 When jumpsuits take severe damage, their suit sensors break. 2017-04-27 02:32:35 -05:00
CitadelStationBot
3a80e3529f Fixes chameleon guns projectile 2017-04-26 17:15:44 -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
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
CitadelStationBot
d8a3294686 Refactors T-Ray Scanners 2017-04-25 14:30:08 -05:00
CitadelStationBot
387caa518f Changed alternate appearances to /datum/atom_hud s 2017-04-23 13:26:08 -05:00