Detective Google
|
231fd0edea
|
fixes the stupid fucking tile placing list
|
2020-04-30 23:04:35 -05:00 |
|
Detective Google
|
c911d81cdc
|
fixes the volanic subtypes of the other thing
|
2020-04-30 21:21:59 -05:00 |
|
Detective Google
|
6316b02e68
|
unfucks changeturf for the more_caves
|
2020-04-30 21:17:41 -05:00 |
|
Detective Google
|
9c049ef02b
|
more mapping fixes
|
2020-04-30 21:02:31 -05:00 |
|
kevinz000
|
c9cd134132
|
linter fix
|
2020-04-30 17:39:30 -07:00 |
|
Detective Google
|
df2b622007
|
nukes the SpawnTerrain proc used for tg geysers
|
2020-04-30 19:34:27 -05:00 |
|
Detective-Google
|
c146c898c0
|
Merge branch 'master' into 91-files-changed-fml
|
2020-04-30 18:42:38 -05:00 |
|
Detective Google
|
41d1dd1763
|
fixes the maps
|
2020-04-30 18:13:02 -05:00 |
|
Detective Google
|
f6736e862d
|
it compiles, now to fix the maps
|
2020-04-30 15:49:06 -05:00 |
|
ZeroMan
|
52b7086876
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ilowkeydespiseatmospherics
# Conflicts:
# _maps/map_files/BoxStation/BoxStation.dmm
|
2020-04-30 13:48:48 -04:00 |
|
kevinz000
|
02265010d6
|
fixes
|
2020-04-30 10:07:17 -07:00 |
|
kevinz000
|
7e8ebfde83
|
whew
|
2020-04-30 10:03:35 -07:00 |
|
kevinz000
|
034499f356
|
new stuff
|
2020-04-30 09:59:08 -07:00 |
|
kevinz000
|
8dae739d8f
|
fixes
|
2020-04-30 01:39:38 -07:00 |
|
kevinz000
|
bd7b1b1193
|
fixes
|
2020-04-30 01:23:21 -07:00 |
|
kevinz000
|
f028672e3c
|
Merge remote-tracking branch 'citadel/master' into 91-files-changed-fml
|
2020-04-30 01:00:08 -07:00 |
|
kevinz000
|
72cbb77ecc
|
fixes
|
2020-04-30 00:48:37 -07:00 |
|
kevinz000
|
d176125c46
|
Merge pull request #11972 from Trilbyspaceclone/medical-witchcraft
More Useful Gauze MK II
|
2020-04-29 12:02:51 -07:00 |
|
kevinz000
|
830e1b46c8
|
Merge pull request #12028 from Putnam3145/fix-story-storyteller
Some more admeme potential for dynamic
|
2020-04-29 12:02:21 -07:00 |
|
kevinz000
|
57ab38185f
|
Merge pull request #12014 from Trilbyspaceclone/patch-358
Buffs shoulder holsters
|
2020-04-29 12:00:03 -07:00 |
|
Lin
|
64a5831a28
|
Merge pull request #12044 from Citadel-Station-13/kevinz000-patch-2
Fixes cybernetics not updating slowdowns when dropping shield
|
2020-04-29 01:07:55 +00:00 |
|
ZeroMan
|
18eb42315e
|
i missed a src
|
2020-04-28 02:55:25 -04:00 |
|
ZeroMan
|
8dc130175d
|
i actually despise coding
|
2020-04-28 02:46:46 -04:00 |
|
Lin
|
68bad2ee3f
|
Merge pull request #12033 from Citadel-Station-13/kevinz000-patch-6
fixes shield bashing working while downed
|
2020-04-27 16:24:29 +00:00 |
|
TrilbySpaceClone
|
5d6da47db7
|
Merge branch 'master' into medical-witchcraft
|
2020-04-27 07:25:18 -04:00 |
|
kevinz000
|
4e8a8dbebd
|
Update items.dm
|
2020-04-27 02:55:11 -07:00 |
|
Putnam
|
00c2ddce8f
|
Actually this is better
|
2020-04-25 23:18:37 -07:00 |
|
Putnam
|
3da4701dff
|
Switch roundstart thing to initial.
|
2020-04-25 23:06:15 -07:00 |
|
kevinz000
|
5c20bde9f0
|
Update shields.dm
|
2020-04-25 20:58:22 -07:00 |
|
Putnam
|
257de9d4c9
|
Adds uplinks back to nukies.
|
2020-04-25 19:22:55 -07:00 |
|
Putnam
|
d7c0834794
|
A couple important comments.
|
2020-04-25 17:22:12 -07:00 |
|
Putnam
|
b9e88f85bb
|
Allowed better admeme stuff for dynamic
|
2020-04-25 17:15:17 -07:00 |
|
kevinz000
|
565bfdb7b0
|
Merge pull request #11959 from Trilbyspaceclone/patch-351
Nerfs spiders defence stat against flyswatters - Alt Australian crew buff.
|
2020-04-25 17:10:33 -07:00 |
|
kevinz000
|
af08e0fecf
|
Merge pull request #11984 from Hatterhat/fastpump
The Neo-Russian Rifleman's Primer - a book that makes you pump shotguns and work rifle bolts faster
|
2020-04-25 17:07:29 -07:00 |
|
kevinz000
|
d7f38faab9
|
Merge pull request #11971 from Putnam3145/fix-story-storyteller
More dynamic tweaks
|
2020-04-25 17:05:38 -07:00 |
|
kevinz000
|
da61b04ed0
|
Merge pull request #11997 from Ghommie/Ghommie-cit705
code for designs' security level requirements.
|
2020-04-25 16:53:48 -07:00 |
|
kevinz000
|
4689e2aeb6
|
Merge pull request #11980 from Ghommie/Ghommie-cit700
Movespeed modifiers refactor port.
|
2020-04-25 16:51:14 -07:00 |
|
Lin
|
499e71c528
|
Merge pull request #11993 from Ghommie/Ghommie-cit704
porting CEV-Eris pickweight procs.
|
2020-04-25 18:30:26 +00:00 |
|
Trilbyspaceclone
|
89bb18fe98
|
Update belt.dm
|
2020-04-25 00:50:03 -04:00 |
|
Ghom
|
21619b1ee3
|
Merge pull request #11925 from Trilbyspaceclone/patch-347
The Pr that nerfs crayon eating
|
2020-04-25 02:54:40 +02:00 |
|
Ghom
|
5ccdc55e42
|
Merge pull request #11979 from kevinz000/magnetic_harness
Cybernetic arm implant balance pass (namely: shields)
|
2020-04-25 02:47:28 +02:00 |
|
Putnam
|
17f6099013
|
new clamp
|
2020-04-24 16:18:34 -07:00 |
|
Putnam
|
95d1a25df7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into fix-story-storyteller
|
2020-04-24 16:07:38 -07:00 |
|
Detective Google
|
71be8ed2fc
|
ports all the tg junk for icemoon, not yet changed to make it all compile
|
2020-04-24 00:02:03 -05:00 |
|
Ghommie
|
e0a51903a1
|
Not yet implemented design security level requirements.
|
2020-04-24 00:51:04 +02:00 |
|
Ghommie
|
de531bd047
|
porting CEV-Eris pickweight procs.
|
2020-04-23 21:47:54 +02:00 |
|
kevinz000
|
cf61795101
|
Merge pull request #11941 from kiwedespars/punch-bundle
re-adds north star gloves to traitors for 20 tc
|
2020-04-23 11:45:04 -07:00 |
|
Trilbyspaceclone
|
8bcdbf5fc6
|
Update weaponry.dm
|
2020-04-23 03:29:26 -04:00 |
|
TrilbySpaceClone
|
c8b3032087
|
Merge branch 'master' into cube-world
|
2020-04-23 02:04:56 -04:00 |
|
kevinz000
|
1236e11eca
|
Merge pull request #11950 from Citadel-Station-13/Ghommie-patch-3
Fixing a little mistake with a config.
|
2020-04-22 18:41:21 -07:00 |
|