LetterJay
|
22aef374e2
|
Merge branch 'master' into upstream-merge-26140
|
2017-05-13 01:28:34 -04:00 |
|
LetterJay
|
485bca003f
|
Merge pull request #640 from Citadel-Station-13/upstream-merge-26527
[MIRROR] Zombie/limb refactors/fixes
|
2017-05-13 01:24:55 -04:00 |
|
CitadelStationBot
|
5790e8359a
|
[MIRROR] GPS Personalizations [Post TGPSUI] (#642)
* GPS Personalizations [Post TGPSUI]
* Delete gps.dm.rej
* Update gps.dm
* eol
|
2017-05-10 16:27:49 -07:00 |
|
CitadelStationBot
|
93e652e07b
|
Capitalizes machine names when they talk on radio (#886)
|
2017-05-10 16:04:58 -07:00 |
|
CitadelStationBot
|
914ae0cc4f
|
You can now buy double eswords from the uplink, but you can no longer use two eswords to construct them (#891)
|
2017-05-10 16:04:42 -07:00 |
|
kevinz000
|
005d8a8156
|
Lets try that again... (#868)
* TGUI GPS
* fixes .rej
|
2017-05-08 22:58:46 -07:00 |
|
kevinz000
|
77c066d93a
|
Revert "[MIRROR] TGUI GPS" (#867)
* Revert "Automatic changelog generation for PR #608 [ci skip]"
This reverts commit 7701c39fde.
* Revert "TGUI GPS (#608)"
This reverts commit ba0f4b1c59.
|
2017-05-08 22:48:34 -07:00 |
|
CitadelStationBot
|
ba0f4b1c59
|
TGUI GPS (#608)
|
2017-05-08 22:46:42 -07:00 |
|
CitadelStationBot
|
faf8829d30
|
[MIRROR] Adamantine golem leadership (#785)
* Adamantine golem leadership
* Update stylesheet.dm
* Delete golems.dm.rej
* Delete stylesheet.dm.rej
* Update golems.dm
* fuck line endings
|
2017-05-08 22:16:09 -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
|
13b0ae2b45
|
Merge pull request #676 from Citadel-Station-13/upstream-merge-26725
[MIRROR] Proselytizers can now charge from Sigils of Transmission, and Sigils of Transmission can be charged with brass
|
2017-05-07 19:37:35 -07:00 |
|
kevinz000
|
78d64cbeed
|
Merge pull request #825 from Citadel-Station-13/upstream-merge-26941
[MIRROR] C4 planting takes 3 seconds, down from 5
|
2017-05-07 12:59:10 -07:00 |
|
CitadelStationBot
|
1a5050692b
|
Fixes his grace CtrlClick
|
2017-05-07 11:33:55 -05:00 |
|
CitadelStationBot
|
b0cceb8766
|
C4 planting takes 3 seconds, down from 5
|
2017-05-07 09:31:51 -05:00 |
|
kevinz000
|
d9908a74a7
|
Merge pull request #748 from Citadel-Station-13/upstream-merge-26808
[MIRROR] Adds aesthetic basalt floor tiles
|
2017-05-07 06:24:50 -07:00 |
|
kevinz000
|
035dd93158
|
Merge pull request #756 from Citadel-Station-13/upstream-merge-26848
[MIRROR] Adds spewium toxin in traitor kits
|
2017-05-06 21:43:08 -07:00 |
|
kevinz000
|
c8dbcb8597
|
Merge pull request #754 from Citadel-Station-13/upstream-merge-26863
[MIRROR] Fixes dropped cyborg repair modules
|
2017-05-06 21:30:12 -07:00 |
|
kevinz000
|
329190d660
|
Merge pull request #809 from Citadel-Station-13/upstream-merge-26933
[MIRROR] Makes medbay vending machines buildable
|
2017-05-06 14:22:08 -07:00 |
|
kevinz000
|
638250993c
|
Merge pull request #770 from Citadel-Station-13/upstream-merge-26873
[MIRROR] Fixes grammar error on spawner grenades
|
2017-05-06 14:11:18 -07:00 |
|
CitadelStationBot
|
30f7e170a3
|
Makes medbay vending machines buildable
|
2017-05-06 13:52:12 -05:00 |
|
CitadelStationBot
|
5de94c22e7
|
Fixes grammar error on spawner grenades
|
2017-05-04 20:25:46 -05:00 |
|
CitadelStationBot
|
46d7976488
|
Adds spewium toxin in traitor kits
|
2017-05-04 17:53:42 -05:00 |
|
CitadelStationBot
|
34bf3e4113
|
Fixes dropped cyborg repair modules
|
2017-05-04 17:50:32 -05:00 |
|
CitadelStationBot
|
da781e0d76
|
Adds aesthetic basalt floor tiles
|
2017-05-04 06:12:26 -05:00 |
|
CitadelStationBot
|
7c56c058b3
|
Adds examining mouths with flashlights
|
2017-05-04 06:11:22 -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
|
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
|
cc0a9b87fb
|
Changes /obj/machinery to have atom/movable occupants
|
2017-05-01 15:58:52 -05:00 |
|
LetterJay
|
b57a4aa6b4
|
Merge branch 'master' into upstream-merge-26386
|
2017-05-01 15:27:25 -05:00 |
|
LetterJay
|
7c02c0ef6a
|
Merge pull request #649 from Citadel-Station-13/upstream-merge-26678
[MIRROR] Ports chem grenades to Initialize
|
2017-05-01 07:58:20 -05:00 |
|
CitadelStationBot
|
fad23e97c3
|
Proselytizers can now charge from Sigils of Transmission, and Sigils of Transmission can be charged with brass
|
2017-05-01 07:24:29 -05:00 |
|
LetterJay
|
06bfa8770e
|
Merge branch 'master' into upstream-merge-26129
|
2017-04-29 11:45:37 -05:00 |
|
LetterJay
|
991fb8335c
|
manual merge
|
2017-04-29 11:42:28 -05:00 |
|
CitadelStationBot
|
9d50549c22
|
Ports chem grenades to Initialize
|
2017-04-29 08:13:56 -05:00 |
|
CitadelStationBot
|
daeba2eec7
|
Zombie/limb refactors/fixes
|
2017-04-28 21:05:06 -05:00 |
|
CitadelStationBot
|
941246e8fe
|
Tank suicide no longer gibs w/o enough pressure
|
2017-04-28 20:59:39 -05:00 |
|
CitadelStationBot
|
caaf42815a
|
Changes some << to to_chat
|
2017-04-28 06:14:47 -05:00 |
|
CitadelStationBot
|
83916bee5d
|
Adds crayon grinding
|
2017-04-27 09:17:44 -05:00 |
|
CitadelStationBot
|
bcab389ca2
|
New() goes in the trash, we've gotta Initialize()
|
2017-04-26 17:15:48 -05:00 |
|
CitadelStationBot
|
bde5d6253a
|
Unorphans the blackbox
|
2017-04-26 17:05:23 -05:00 |
|
CitadelStationBot
|
87ce25df9b
|
Removes a unused chem (#576)
|
2017-04-26 11:09:00 -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 |
|
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 |
|
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
|
16c4f0da66
|
Merge pull request #563 from Citadel-Station-13/upstream-merge-26420
[MIRROR] Dance Machine ~Fixes~
|
2017-04-25 20:36:43 -05:00 |
|
CitadelStationBot
|
fc0ff20e75
|
Dance Machine ~Fixes~
|
2017-04-25 15:14:54 -05:00 |
|