LetterN
18b7069f1f
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2022-01-11 09:49:38 +08:00
TripleShades
226a299aff
Update dirt.dm
2021-12-19 17:29:01 -05:00
LetterN
8dcfea5817
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-11-21 10:34:14 +08:00
Lin
efa02148d1
Merge pull request #15275 from keronshb/halloweenball2021
...
Spookystation (Ball Map) and Vector Cars
2021-11-17 16:26:07 +00:00
LetterN
fa6946fae4
added the funny. Also adds balloon_alert to more stuff (primarily atmos)
2021-11-16 16:10:12 +08:00
DeltaFire
6aa906395c
not a gaius reference
...
hhhh let me just replace all the ex_acts missing some args and adjust them
2021-11-14 21:34:59 +01:00
DeltaFire
7d2ff194d1
this WILL fail CI
...
hnnnngh
2021-11-14 20:48:41 +01:00
keronshb
efd12e4fd5
Changes for merge
2021-11-01 12:07:44 -04:00
silicons
186b552103
merge
2021-10-29 21:50:58 -07:00
keronshb
3cfea7eb92
Ball2021
2021-10-16 00:02:05 -04:00
silicons
ac0fd70b0b
Update misc_floor.dm ( #15140 )
2021-09-14 02:24:15 +02:00
keronshb
e7b6c9ab5e
Catwalk Flooring
2021-08-22 22:41:48 -04:00
TripleShades
dfff5339c9
Update water.dm
2021-07-31 00:23:09 -04:00
TripleShades
652ffe22a2
Update water.dm
2021-07-30 23:58:11 -04:00
TripleShades
7d7525825d
deco waterrrr
2021-07-30 23:51:57 -04:00
MrJWhit
1c1fac3f06
Update change_turf.dm
2021-07-16 15:10:39 -04:00
Lin
0bfb671f4e
Merge pull request #14482 from silicons/combat_v7
...
Combat v7 - Sprint removal, automatic block/parry, turns combat mode into a pure UI/interaction toggle with no side effects, and a truckload of other stuff.
2021-06-27 13:04:29 -07:00
silicons
08f251a88c
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-27 10:44:51 -07:00
Putnam3145
f77495f45d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
2021-06-21 02:19:51 -07:00
silicons
4768b23398
Merge pull request #14860 from Arturlang/nanite_updates
...
Updates our nanite stuff to TG's, mostly
2021-06-18 20:01:05 -07:00
silicons
a8b7c07f00
Update open.dm
2021-06-17 07:07:49 -07:00
Putnam3145
dbdc3001ba
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
2021-06-16 23:33:14 -07:00
silicons
c1928c9446
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-16 19:04:16 -07:00
Artur
724b34f55d
https://github.com/tgstation/tgstation/pull/54710
2021-06-16 00:44:32 +03:00
silicons
b04a580e1d
it works
2021-06-13 22:19:06 -07:00
silicons
e7f5f80fb1
yelling
2021-06-13 15:34:47 -07:00
silicons
b6bb20842f
Yelling works
2021-06-13 00:50:00 -07:00
silicons
8feb473e65
fixes
2021-06-12 04:49:23 -07:00
Putnam
86177c51c4
auxgm part 1
...
see also https://github.com/Baystation12/Baystation12/blob/dev/code/modules/xgm/xgm_gas_data.dm
2021-06-08 09:54:28 -07:00
silicons
40f2c06f2e
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-07 16:47:11 -07:00
Putnam
1c17570ea8
works but leaks
2021-05-30 00:28:51 -07:00
Putnam
e580c504fa
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
2021-05-21 18:52:16 -07:00
silicons
5601badbff
deterministic explosion system ( #13392 )
...
* wae explosions
* okay
* changes
* fixes
* fix
* ok
* ok
* kills more dead code
* okay
* fix
* ok
* tiles
* ok
* okay
* woops
* ok
* fix
* okay
* mob damage
* fixes
* insanity
* more
* more
* fixes
* more
* woot
* don't commit that
* YES
* fix
2021-05-12 05:44:53 -05:00
silicons
47489c21d6
Merge remote-tracking branch 'citadel/master' into auxtools-atmos
2021-04-27 00:59:45 -07:00
silicons
a415453540
ripping off my own code
2021-04-26 23:29:37 -07:00
Putnam
f1e55f2df0
Paranoid updates to maybe fix air duplication
2021-03-20 22:02:47 -07:00
LetterN
a478555dbd
mapfix
2021-03-15 21:02:50 +08:00
Letter N
935e46b492
The Mapping Update
...
Cleans up the map (again)
Makes mining code more better
2021-03-12 12:11:35 +08:00
Putnam
cc360288bd
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
2021-03-08 14:46:46 -08:00
Putnam
f07a9c13fb
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
2021-03-02 01:44:58 -08:00
Letter N
5304029dd9
Merge remote-tracking branch 'origin/master' into hardsync-1.5
2021-02-23 11:01:42 +08:00
SandPoot
123de14009
upload files
2021-02-18 15:05:39 -03:00
SandPoot
f738023097
Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
...
This reverts commit 2e29f30fdf724910cfab
2021-02-18 15:04:46 -03:00
SandPoot
cf2e70671a
upload files
2021-02-18 14:47:10 -03:00
Letter N
f87aa0ac5b
toast. And DiscoFox ™️
2021-02-08 18:46:05 +08:00
Putnam
d8e408d1f1
Fixed some major incompetency from 2018.
...
// If someone will place 0 of some gas there, SHIT WILL BREAK. Do not do that.
LINDA_turf_tile.dm, line 16.
2021-01-24 13:26:47 -08:00
Putnam
51100c9bf9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
2021-01-20 18:38:52 -08:00
Letter N
02ca168df3
why are we building windows facing nothing but rock infront of it?
2021-01-20 11:37:44 +08:00
Putnam
158dd11d8d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
2021-01-19 17:52:40 -08:00
silicons
ea07ad6e48
Merge remote-tracking branch 'citadel/master' into tgsync
2021-01-13 15:41:28 -07:00
