 Artur
|
fb7dc7a54c
|
Fucking icons
|
2020-04-14 09:42:11 +03:00 |
|
|
Artur
|
356f2913d7
|
Ghommies suggestions and renames a proc
|
2020-04-14 09:30:14 +03:00 |
|
|
Artur
|
f910a0fd32
|
Conflict fixes
|
2020-04-14 09:27:54 +03:00 |
|
|
Ghommie
|
42ff9b1d35
|
Final test, fixes and parent calls.
|
2020-04-14 01:23:26 +02:00 |
|
|
Ghommie
|
616d482cf6
|
Deleting poly clothes copypasta.
|
2020-04-13 22:51:46 +02:00 |
|
|
Ghommie
|
db43f53ac4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611
|
2020-04-13 16:15:40 +02:00 |
|
|
Ghommie
|
0816512150
|
more work.
|
2020-04-13 16:09:52 +02:00 |
|
|
kevinz000
|
9f2ed092c5
|
Merge pull request #11275 from Citadel-Station-13/Ghommie-patch-6
Reenables the swarmers event.
|
2020-04-13 05:50:24 -07:00 |
|
|
Ghom
|
dfa58cb517
|
Merge pull request #10986 from Seris02/atomwalkers
wall walking boots for traitors
|
2020-04-13 14:25:43 +02:00 |
|
|
Ghom
|
6157500f25
|
FYI, Dropped() already handles it.
|
2020-04-13 14:16:48 +02:00 |
|
|
Seris02
|
468c59bf49
|
oops
|
2020-04-13 20:12:20 +08:00 |
|
|
kevinz000
|
768909020e
|
Merge pull request #11827 from kiwedespars/nerf
nerfs immortal haste cd
|
2020-04-12 22:35:10 -07:00 |
|
|
kevinz000
|
105d405d2d
|
Merge pull request #11837 from Ghommie/Ghommie-cit678
Item color removal port fixes.
|
2020-04-12 22:34:45 -07:00 |
|
|
Seris02
|
950038f4a7
|
merge fixes?
|
2020-04-13 11:12:16 +08:00 |
|
|
Seris02
|
f158536e59
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into atomwalkers
|
2020-04-13 11:10:24 +08:00 |
|
|
Seris02
|
b9c9991a5d
|
merge fix
|
2020-04-13 10:57:09 +08:00 |
|
|
Ghommie
|
0d0f14d3f8
|
Item color removal port fixes.
|
2020-04-13 03:34:58 +02:00 |
|
|
Ghom
|
609eb190e0
|
Update area_copy.dm
|
2020-04-13 03:29:07 +02:00 |
|
|
kevinz000
|
e962afedfa
|
Merge pull request #11825 from Ghommie/Ghommie-cit674
Little Holodeck refactor.
|
2020-04-12 17:03:11 -07:00 |
|
|
kevinz000
|
6b6683846b
|
Merge pull request #11819 from Ghommie/Ghommie-cit672
Minor action datum refactor and spellcasting fix.
|
2020-04-12 17:02:36 -07:00 |
|
|
kevinz000
|
8604297dcd
|
Merge pull request #11811 from Ghommie/Ghommie-cit671
Fixes and standarizes a few liver troubles. Re-enables liver failure.
|
2020-04-12 17:01:50 -07:00 |
|
|
Ghommie
|
05a954f000
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611
|
2020-04-13 02:01:01 +02:00 |
|
|
kevinz000
|
d60932ca5d
|
Merge pull request #11697 from Ghommie/Ghommie-cit655
Ports "Obliterates item_color: new washing machine functionality edition"
|
2020-04-12 16:16:37 -07:00 |
|
|
Ghom
|
b00e97b848
|
Merge pull request #10732 from kevinz000/eldritch_affairs
Eldritch Affairs
|
2020-04-12 20:47:19 +02:00 |
|
|
kiwedespars
|
6f8992e712
|
Update haste.dm
|
2020-04-11 21:34:06 -07:00 |
|
|
Ghom
|
a96f6238df
|
Merge pull request #10891 from Trilbyspaceclone/more_crates+bags
[Ready]Better crate options
|
2020-04-12 05:48:20 +02:00 |
|
|
Ghom
|
d693d3ef26
|
Merge pull request #11807 from Citadel-Station-13/kevinz000-patch-4
datum pipeline null gasmix stack trace now gives a REF()
|
2020-04-12 05:46:07 +02:00 |
|
|
Ghommie
|
983f369357
|
Little Holodeck refactor.
|
2020-04-12 01:49:25 +02:00 |
|
|
Ghom
|
1babc75a69
|
Merge pull request #11818 from spookydonut/patch-1
Update spacemandmm to 1.4
|
2020-04-11 23:59:31 +02:00 |
|
|
spookydonut
|
a6f6a27c87
|
Update code/modules/vending/_vending.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-04-12 00:53:57 +08:00 |
|
|
Ghom
|
848c1996e4
|
Merge pull request #11806 from Citadel-Station-13/kevinz000-patch-3-1
removes hotspot expose from skateboards
|
2020-04-11 18:31:26 +02:00 |
|
|
Ghom
|
ae1785af70
|
Merge pull request #11802 from Akrilla/alien_attack
Fixes attack_alien damage
|
2020-04-11 18:31:07 +02:00 |
|
|
Ghom
|
11fa208838
|
Merge pull request #11800 from Akrilla/changling-readapt
Fixes up changling readapting
|
2020-04-11 18:30:49 +02:00 |
|
|
Ghommie
|
7615f63753
|
Oopsie
|
2020-04-11 17:43:09 +02:00 |
|
|
Ghommie
|
31e0321808
|
Minor action datum refactor and spellcasting fix.
|
2020-04-11 16:53:08 +02:00 |
|
|
Ghom
|
f9f1bbc05f
|
Merge pull request #11804 from Akrilla/beepsky-tie
Fixes beepsky ziptie weirdness
|
2020-04-11 13:40:24 +02:00 |
|
|
spookydonut
|
230e5fca20
|
fix everything
|
2020-04-11 15:32:09 +08:00 |
|
|
Akrilla
|
8abc0cc0a7
|
!on
|
2020-04-11 05:24:24 +01:00 |
|
|
Ghom
|
cd2edb3cf1
|
dont need to null when qdeling later (#11797)
|
2020-04-11 01:59:46 +02:00 |
|
|
Ghom
|
a75bd30911
|
Update carbon_defense.dm
|
2020-04-10 19:54:12 +02:00 |
|
|
Putnam3145
|
b939359e35
|
Made my choice thing actually... do something (#11787)
|
2020-04-10 18:16:19 +02:00 |
|
|
kevinz000
|
d5769a6ee4
|
Update carbon_defense.dm (#11738)
|
2020-04-10 18:13:50 +02:00 |
|
|
Ghommie
|
af55880794
|
Fixes and standarizes a few liver troubles. Re-enables liver failure.
|
2020-04-10 17:22:34 +02:00 |
|
|
Arturlang
|
b40fb55539
|
Fixes mesmerzie and makes it work better (#11785)
* Weh
* Mesmerize works a lot nicer now
|
2020-04-10 15:41:35 +02:00 |
|
|
kevinz000
|
d19dd8f2e1
|
fixes baystruments (#11790)
* fix
* sigh
|
2020-04-10 15:36:42 +02:00 |
|
|
kevinz000
|
185b38e109
|
Update scooter.dm
|
2020-04-10 04:33:35 -07:00 |
|
|
kevinz000
|
9d931c0a3a
|
Update datum_pipeline.dm
|
2020-04-10 04:32:16 -07:00 |
|
|
kevinz000
|
b09ac26ab2
|
Update scooter.dm
|
2020-04-10 04:25:53 -07:00 |
|
|
Akrilla
|
2a05903808
|
do_after
|
2020-04-10 04:26:35 +01:00 |
|
|
Akrilla
|
5c74e239a0
|
wew
|
2020-04-10 03:43:18 +01:00 |
|