CitadelStationBot
040ac1236d
[MIRROR] woops i forgot to check tick cannons fill proc. ( #968 )
...
* woops i forgot to check tick cannons fill proc.
* Delete pneumaticCannon.dm.rej
* Update pneumaticCannon.dm
2017-05-14 20:23:39 -07:00
CitadelStationBot
41f110380c
[MIRROR] [READY]Gives the clown a pie cannon, also improves pneumatic cannons ( #935 )
...
* [READY]Gives the clown a pie cannon, also improves pneumatic cannons
* Delete gang.dm.rej
2017-05-14 20:18:02 -07:00
LetterJay
6c4a355379
Merge pull request #850 from Citadel-Station-13/upstream-merge-26980
...
[MIRROR] Small Click refactor.
2017-05-14 16:40:30 -04:00
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
52fa1f314f
Merge branch 'master' into upstream-merge-26760
2017-05-14 01:02:26 -04:00
CitadelStationBot
474fd582ea
Ports dakimakuras from HippieStation.
2017-05-13 18:00:32 -05:00
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
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
CitadelStationBot
98765ec854
Small Click refactor.
2017-05-08 03:06:05 -05:00
kevinz000
2e0dd27978
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-26813
2017-05-07 22:28:00 -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
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
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
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
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
036109de58
Changes a bunch of hrefs to the proper defines
2017-05-02 02:20:07 -05:00
CitadelStationBot
cc0a9b87fb
Changes /obj/machinery to have atom/movable occupants
2017-05-01 15:58:52 -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
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
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
CitadelStationBot
607868a5de
[s]Exploit whack-a-mole
2017-04-25 01:31:50 -05:00
CitadelStationBot
3ebf5ab3bc
Fixes objects being used on backpacks if they don't fit
2017-04-24 17:39:27 -05:00
CitadelStationBot
682a00b768
Greyscale lighters no longer color the flame ( #517 )
2017-04-23 01:35:43 -05:00
CitadelStationBot
1a93abc66e
Conveyor movement refactor/fix
2017-04-21 17:28:09 -05:00
CitadelStationBot
80ec92c9bd
Gives wirecutters origin tech
2017-04-19 04:32:43 -05:00
CitadelStationBot
49cef72564
[s] Fixes RCD,RCLD & ARCD ( #403 )
2017-04-15 14:44:58 -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
TaxMaster
45548d26c6
THIS (DOESN'T) VIOLATE THE NAP
...
Clothing 2: If it doesn't pass i'm seriously going to stop trying
boogaloo
2017-04-01 22:50:05 -05:00
katnep
31d0f4cb1f
Mining Vendor Redo ( #298 )
...
* Mining Vendor Redo
basically Re adds all the stuff i added back at the start of 6th port,
also re added stimpacks to the lsit becuase i don't see why they needed
to be removed from it
* whetstone removed
whetstone removed
* price balances
just tweaked the prices of the new bundles to make them actually worth
purchasing following a 5 for the price of 4 standard
* The final change
finishes the requested changes
* removes excessive line spacing
* removes trailing comma
2017-03-29 17:11:00 -04:00
Poojawa
f67e9f6d87
Bleeding edgy refresh ( #303 )
...
* not code stuff
* other things
* global vars, defines, helpers
* onclick hud stuff, orphans, world.dm
* controllers and datums
* game folder
* everything not client/mobs in modules
* client folder
* stage 1 mob stuff
* simple animal things
* silicons
* carbon things
* ayylmaos and monkeys
* hyoomahn
* icons n shit
* sprite fixes
* compile fixes
* some fixes I cherrypicked.
* qdel fixes
* forgot brain refractors
2017-03-21 11:44:10 -05:00
TalkingCactus
09ec454325
Random Fixes + Dildos ( #268 )
...
* I'LL SNEAK THIS IN, TOO
* will it blend
* event tweaking
* new kinkmate sprite
* savefile bugfixes
* drinks got overwritten again
rip
* replaces missing styles
* dildos
* last bit
2017-03-10 12:51:16 -05:00
