Putnam
|
425f532f76
|
WHOOPS
|
2020-01-31 13:12:50 -08:00 |
|
Putnam
|
809f57a15d
|
also added kill-once objectives
|
2020-01-31 12:25:19 -08:00 |
|
Putnam
|
29e0ac52c4
|
fuzzy objectives
|
2020-01-31 11:52:05 -08:00 |
|
Putnam
|
d358913bde
|
linter is right, whoops
|
2020-01-28 17:26:32 -08:00 |
|
Putnam
|
8df9a051ec
|
it compiles now, ready for testmerge probs
|
2020-01-27 19:09:04 -08:00 |
|
Putnam
|
233aeaa456
|
removed some suggested bad possible contraband
|
2020-01-26 19:03:09 -08:00 |
|
Putnam
|
37777c4cc7
|
Removed the wirecutting one
|
2020-01-25 13:37:40 -08:00 |
|
Putnam
|
c58b4daa35
|
collectors too
this doesn't compile but like. it's a draft
|
2020-01-24 11:58:58 -08:00 |
|
Putnam
|
847b3c0a09
|
Fixed flavor objectives and added more.
|
2020-01-24 10:46:07 -08:00 |
|
Putnam
|
815b4f033d
|
made flavor things a game option + more hoard
|
2020-01-20 04:13:54 -08:00 |
|
Putnam
|
dfaa3bf15c
|
Added another flavor obj, "horde" to "hoard"
|
2020-01-20 03:46:44 -08:00 |
|
Putnam
|
67c2fdca52
|
more flavor objectives
|
2020-01-20 01:20:42 -08:00 |
|
Putnam
|
8e674817a9
|
errors
|
2020-01-20 00:30:18 -08:00 |
|
Putnam
|
06c66617e6
|
m o r e traitor objectives
|
2020-01-19 18:58:10 -08:00 |
|
Putnam
|
bc5646f8b1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into antag-overhaul
|
2020-01-19 00:56:17 -08:00 |
|
Putnam
|
5eba760aa8
|
Reworked survivalist
|
2020-01-18 22:07:54 -08:00 |
|
Putnam
|
e1cf63e0ac
|
Greentext tweaked
|
2020-01-18 21:32:42 -08:00 |
|
Putnam
|
d287835d14
|
Made quirk blacklisting antag-sided
|
2020-01-18 21:29:27 -08:00 |
|
Ghom
|
0a5e2cf8ff
|
Merge pull request #10601 from Putnam3145/dojo-hilbert
Adds 16777216 dorms to the ghost dojo
|
2020-01-19 03:02:32 +01:00 |
|
r4d6
|
810556cbb7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Passive-Vents
|
2020-01-18 16:03:49 -05:00 |
|
Lin
|
760bbfa8b6
|
Merge pull request #10571 from Ghommie/Ghommie-cit507
Riot foam dart design cost consistency.
|
2020-01-18 20:46:16 +00:00 |
|
Ghom
|
d709edb1c2
|
Merge pull request #10578 from r4d6/Mining
Port TG's Mining changes
|
2020-01-18 20:32:14 +01:00 |
|
Ghom
|
ce2fc37df3
|
Merge pull request #10501 from Putnam3145/more-atmos
Adds a couple relief valves
|
2020-01-18 20:16:30 +01:00 |
|
Ghom
|
9f2bc48d74
|
Merge pull request #10600 from Kraseo/ricetriangles
Fixes sprinkles on jelly donuts + lack of berry juice
|
2020-01-18 18:52:14 +01:00 |
|
Ghom
|
07b3bac674
|
Merge pull request #10580 from Putnam3145/craft-log
Craft logging
|
2020-01-18 17:47:31 +01:00 |
|
Ghom
|
c00be1a9b1
|
Merge pull request #10586 from Tupinambis/RLDNerf
Nerfs RLDs because they hard counter nightmares and night ops.
|
2020-01-18 17:42:30 +01:00 |
|
Ghom
|
29c3e72335
|
You jelly.
|
2020-01-18 17:41:31 +01:00 |
|
Ghom
|
5a613809f5
|
Merge pull request #10599 from Putnam3145/gibtonite-explosion-fix
Fixed gibtonite instantly exploding on pick mining
|
2020-01-18 16:54:52 +01:00 |
|
Putnam
|
133cb89b32
|
hilbert's hotel for ghost dojo
|
2020-01-18 06:55:26 -08:00 |
|
Kraseo
|
6708607073
|
fixes jelly donuts not having sprinkle sprites, fixes jelly donuts not having berry jelly
|
2020-01-18 15:05:07 +01:00 |
|
Putnam
|
b30948a60a
|
Fixed gibtonite instantly exploding on pick mining
|
2020-01-18 04:37:44 -08:00 |
|
Putnam
|
3788bc6676
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into more-atmos
|
2020-01-17 21:33:13 -08:00 |
|
r4d6
|
0d3706b7f9
|
Make public shuttle not require access
|
2020-01-17 22:15:29 -05:00 |
|
kevinz000
|
fd440ac379
|
Merge pull request #10592 from Ghommie/Ghommie-cit508
Kevinz let some files fall back to CRLF.
|
2020-01-17 17:34:13 -07:00 |
|
Ghom
|
da8b29dd23
|
Merge pull request #10591 from Citadel-Station-13/kevinz000-patch-12
Removes blood duplication via virus mix
|
2020-01-18 01:25:34 +01:00 |
|
Ghommie
|
eaff51ff40
|
Kevinz let some files fall back to CRLF.
|
2020-01-17 23:26:05 +01:00 |
|
kevinz000
|
aea0de30d1
|
Merge pull request #10125 from Ghommie/Ghommie-cit449
Ports a few projectile code updates by ke:b:inz.
|
2020-01-17 15:15:08 -07:00 |
|
Ghom
|
34872f6969
|
Merge pull request #10570 from kevinz000/map_network_helpers
Power cable + atmos pipe auto mapping helpers
|
2020-01-17 22:34:38 +01:00 |
|
kevinz000
|
eddb6fda68
|
Update others.dm
|
2020-01-17 14:32:51 -07:00 |
|
kevinz000
|
3c2e6a959d
|
whitespace renormalize
|
2020-01-17 14:25:29 -07:00 |
|
kevinz000
|
05e2b6a441
|
Merge pull request #10569 from keronshb/RemoteMoodResearch
Ports the Nanite Remote, Nanite Mood Programs + Rebalance, and the Research Generating Nanites
|
2020-01-17 14:24:13 -07:00 |
|
kevinz000
|
edccfa3523
|
Update others.dm
|
2020-01-17 14:15:08 -07:00 |
|
kevinz000
|
e69253bf87
|
Update others.dm
|
2020-01-17 14:12:51 -07:00 |
|
Tupinambis
|
22dbd3d265
|
Nerfs RLDs in general. You know I had to do it to em.
|
2020-01-17 12:23:13 -06:00 |
|
Ghom
|
72a83f05b5
|
Merge pull request #10375 from r4d6/radsuit
Add a Radiation Hardsuit
|
2020-01-17 17:36:43 +01:00 |
|
Ghom
|
e7b925e779
|
Merge pull request #10582 from Putnam3145/more_flavor
Made temp flavor "more" pop up with actual temp flavor
|
2020-01-17 14:44:04 +01:00 |
|
Putnam
|
5ace1df9af
|
better logging, that also works
|
2020-01-16 19:09:13 -08:00 |
|
Putnam
|
a4cc73f219
|
some craft logging
|
2020-01-16 18:40:00 -08:00 |
|
Ghom
|
c1e9618757
|
Merge pull request #10565 from Citadel-Station-13/revert-10379-tg-47443-shotgunpbs
Revert "shotgun pointblanking people actually throws them"
|
2020-01-16 23:18:37 +01:00 |
|
kevinz000
|
d110d7bae9
|
Merge pull request #10347 from deathride58/stambufferbuff
[experimental] Buffs the stamina buffer by making it recharge for free.
|
2020-01-16 14:51:38 -07:00 |
|