kevinz000
|
7187da9e72
|
Merge pull request #9456 from Thalpy/Spookytime
[READY] [Spookytime] Adds Jacqueline the Pumpqueen
|
2019-10-15 23:11:35 -07:00 |
|
Thalpy
|
ac2aba50a6
|
Turns Jacq into her own event
|
2019-10-13 22:33:46 +01:00 |
|
kevinz000
|
53858e1818
|
Merge pull request #9416 from Ghommie/Ghommie-cit215
The niche singularity beacon now also moderately buffs meteor waves.
|
2019-10-13 13:56:03 -07:00 |
|
Ghommie
|
c78078bdd4
|
typo
|
2019-10-13 06:08:53 +02:00 |
|
Fermi
|
ecfc988911
|
Okay!
|
2019-10-12 09:15:32 +01:00 |
|
Ghommie
|
9ee1987dec
|
Applying kevinz' ominous warning suggestion
|
2019-10-08 20:04:08 +02:00 |
|
Ghommie
|
52fb4b03ac
|
we are only keeping track of the number of singu beacons, var more efficient.
|
2019-10-05 05:29:57 +02:00 |
|
Ghommie
|
d706944e20
|
The niche singularity beacon now also moderately buffs meteor waves.
|
2019-10-05 04:37:01 +02:00 |
|
Ghommie
|
5d1cac62da
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
|
2019-08-24 13:50:22 +02:00 |
|
BlackMajor
|
5dcd419d8a
|
Merge pull request #8356 from Thalpy/master
[READY] FermiChem! Adds a new reaction mechanic, 9 new chems and a few extra features to accommodate the new chems.
|
2019-08-11 16:09:23 +12:00 |
|
BurgerLua
|
9566caa527
|
Added
|
2019-08-08 09:25:04 -07:00 |
|
Thalpy
|
5795f6bbe2
|
Merge branch 'master' into master
|
2019-08-05 09:09:36 +01:00 |
|
Ghommie
|
ec2a3ea778
|
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
|
2019-07-31 18:56:00 +02:00 |
|
Thalpy
|
9c7b1dee97
|
Merge branch 'master' into master
|
2019-07-15 21:23:04 +01:00 |
|
Ghommie
|
4df4cbd721
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
|
2019-07-15 17:23:01 +02:00 |
|
kevinz000
|
2ec5d3f02e
|
Merge pull request #8886 from Ghommie/Ghommie-cit137
Ports "Refactors NODROP flag into TRAIT_NODROP"
|
2019-07-14 14:05:20 -07:00 |
|
Thalpy
|
f77bcc9765
|
Merge branch 'master' into master
|
2019-07-14 15:10:32 +01:00 |
|
Ghommie
|
129ca9d71f
|
Ports "Refactors NODROP flag into TRAIT_NODROP"
|
2019-07-13 10:27:39 +02:00 |
|
Ghommie
|
8f410429de
|
Ports "Renames SSsqueak to SSminor_mapping"
|
2019-07-13 07:08:03 +02:00 |
|
Thalpy
|
c418312cc6
|
Merge branch 'master' into master
|
2019-07-09 05:33:09 +01:00 |
|
deathride58
|
fca529cb07
|
Merge pull request #8823 from Ghommie/Ghommie-cit108
Ports "fixes spontaneous appendicitis picking incompatible biotypes"
|
2019-07-08 17:52:49 -04:00 |
|
Ghommie
|
b41e289db3
|
Ports "Fixes default supplypods exploding their contents" & co.
|
2019-07-04 22:35:13 +02:00 |
|
Ghommie
|
b501edf9cf
|
Ports "fixes spontaneous appendicitis picking incompatible biotypes"
|
2019-07-04 22:02:20 +02:00 |
|
Ghommie
|
a3ab5f6d23
|
Moving the snowflake mob var to the component and finalizing.
|
2019-07-04 02:03:51 +02:00 |
|
Ghommie
|
c58efa64c1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
|
2019-07-03 02:36:23 +02:00 |
|
Thalpy
|
41eee65b15
|
Merge branch 'master' into master
|
2019-06-17 12:18:40 +01:00 |
|
Fermi
|
6b9becce71
|
Merge branch 'pr/14'
|
2019-06-14 21:29:04 +01:00 |
|
unknown
|
80eb813a07
|
RD can now suplex a rod. Good fucking luck.
|
2019-06-11 18:53:17 +03:00 |
|
Ghommie
|
3cbe9cf6b0
|
componentization part 1: "The flawed theorical code"
|
2019-06-10 22:37:38 +02:00 |
|
kevinz000
|
ab565d2483
|
Merge pull request #8547 from Ghommie/Ghommie-cit29
Moves traits to datums and turn the accessors into defines
|
2019-06-08 01:22:16 -07:00 |
|
Ghommie
|
d3d2b8d898
|
should be ready.
|
2019-06-06 19:24:20 +02:00 |
|
Fermi
|
4607a2b6c3
|
Compile safe. Today's fixes.
|
2019-05-27 05:39:52 +01:00 |
|
Fermi
|
4cb697d2ec
|
Final changes before checks.
|
2019-05-26 17:37:20 +01:00 |
|
deathride58
|
4fc31f6322
|
Merge branch 'master' into fuckatmos
|
2019-05-25 15:34:06 -04:00 |
|
Trilbyspaceclone
|
fb6eca8d46
|
How did this even compile?
|
2019-05-22 21:28:16 -04:00 |
|
Trilbyspaceclone
|
717398213b
|
Update pirates.dm
|
2019-05-22 18:52:15 -04:00 |
|
kevinz000
|
50b6a610e9
|
Merge pull request #8303 from BurgerLUA/Vent-Clog-Fixes-And-Additions
Vent Clog Event Rebalance and Improvements
|
2019-05-17 21:27:32 -07:00 |
|
BurgerLua
|
8b935b9abf
|
Reverts cooking change, adds safety checks.
|
2019-05-09 21:10:44 -07:00 |
|
deathride58
|
5e2a9669d1
|
Merge pull request #8285 from Citadel-Station-13/kevinz000-patch-45
vent_clog event now respects vent welding
|
2019-05-06 22:08:43 -04:00 |
|
BurgerLua
|
4aaab992f5
|
Removed frost oil and spray tan, deep fried items now no longer delete themselves when consumed.
|
2019-04-30 11:53:48 -07:00 |
|
BurgerLua
|
0d7c4c89d3
|
actually lets not have this
|
2019-04-28 19:47:12 -07:00 |
|
BurgerLua
|
5357724de7
|
Rebalanced vent clog events.
|
2019-04-28 19:44:50 -07:00 |
|
kevinz000
|
766a119696
|
Update vent_clog.dm
|
2019-04-25 04:14:35 -07:00 |
|
BurgerLua
|
b0a93cf790
|
retweaked the event instead of removing it
|
2019-04-23 11:51:00 -07:00 |
|
BurgerLua
|
97fb78d07e
|
Reworked the Vent Clog event to shoot out smoke instead of foam; also made the foam shoot out one at a time over a long period of time to prevent lag.
|
2019-04-18 18:00:19 -07:00 |
|
deathride58
|
41375d9737
|
Increases performance significantly by turning garbage collection into a define
|
2019-04-14 11:33:28 -04:00 |
|
deathride58
|
8b75240d89
|
fuck atmos - attempts to optimize atmos by removing GAS_META from the gas mixture meta list and removing the usage of gas archive
|
2019-04-11 17:07:11 -04:00 |
|
kevinz000
|
50b64e8174
|
Merge pull request #8178 from Trilbyspaceclone/patch-91
Makes a new shuttle loan! - Delta locked crates
|
2019-04-02 05:51:05 -07:00 |
|
Trilbyspaceclone
|
18247f28ae
|
Update shuttle_loan.dm
|
2019-03-28 23:35:11 -04:00 |
|
Trilbyspaceclone
|
7a533ffcb7
|
Update shuttle_loan.dm
|
2019-03-28 21:22:40 -04:00 |
|