Commit Graph

1515 Commits

Author SHA1 Message Date
Artur
82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
Artur
3100f98b90 https://github.com/tgstation/tgstation/pull/57915 2021-07-28 02:13:57 +03:00
Artur
cdbd585f4d update_appearance 2021-07-28 02:13:57 +03:00
silicons
224fb7f22c Update tables_racks.dm 2021-07-21 21:34:10 -07:00
silicons
d38a775a16 Update tables_racks.dm 2021-07-21 21:33:46 -07:00
silicons
16622ac95a Update tables_racks.dm 2021-07-20 18:06:49 -07:00
silicons
093df245b3 Merge pull request #14930 from keronshb/mirroromenport
Ports Breaking a mirror now gives you a bad omen
2021-07-18 15:06:03 -07:00
keronshb
c92952c3b0 Cit changes for bullet path 2021-07-06 22:57:31 -04:00
keronshb
fc153b04d3 breaking a mirror is bad for your health (#58381) 2021-07-06 22:47:02 -04:00
Putnam3145
899e74fc83 Componentized acid 2021-07-03 22:10:44 -07:00
Putnam3145
f3b590f5f0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into remove-sleeps 2021-06-30 02:19:02 -07: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
Putnam3145
fbbae70527 i need to go to bed and this is a LOT 2021-06-21 10:14:50 -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
8595e05ad9 Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-13 15:37:35 -07:00
silicons
431acd9d5c Merge pull request #14820 from qweq12yt/more-cargo-stuff
[FIX] Some cargo related fixes
2021-06-13 15:15:20 -07:00
Putnam
833d34ba8e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-06-11 16:28:12 -07:00
qweq12yt
0ca61af62a fixed combo lockers 2021-06-10 16:50:44 -03:00
silicons
fe8323f503 Merge pull request #14747 from keronshb/reinforcedplasmawindowsteps
Adds more deconstruction steps to stronger windows.
2021-06-09 11:13:13 -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
d03bf641dd extreme optimization project to maybe fix game 2021-06-06 21:58:24 -07:00
silicons
cb52be5dd9 fixes linter warnings (#14778)
* woo

* woo
2021-05-31 10:19:20 -05:00
keronshb
13b589507d Clown Spawner
For admin fun!
2021-05-24 15:13:41 -04:00
keronshb
7458909970 Switched heated screws to solder. 2021-05-23 13:36:03 -04:00
keronshb
8787caccba Fixes the roundstart deconstruction issue 2021-05-22 14:12:31 -04:00
keronshb
bd05dd29b6 ReinforcedPlasmaSteps
Adds more steps for deconning stronger windows
2021-05-22 13:58:01 -04: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
The0bserver
f1109c4f67 what a crate day (initial commit) 2021-05-01 02:15:07 -04:00
silicons
47489c21d6 Merge remote-tracking branch 'citadel/master' into auxtools-atmos 2021-04-27 00:59:45 -07:00
silicons
275b532a8c Merge remote-tracking branch 'citadel/master' into combat_v7 2021-04-26 14:17:43 -07:00
silicons
f0c2188c5f Merge pull request #14443 from necromanceranne/baton_change_pr
Another dreaded baton rework pr; batons knockdown and slow on rightclick (with a cooldown), otherwise stagger, plus more
2021-04-20 05:52:59 -06:00
silicons
821511e64e Merge pull request #14571 from BlueWildrose/piracyisillegal
Space pirate sleepers can now be crowbared to be destroyed
2021-04-18 19:38:41 -06:00
BlueWildrose
911d8ffc12 requested changes 2021-04-18 18:02:04 -07:00
necromanceranne
75e0e893a2 Merge branch 'master' into baton_change_pr 2021-04-19 10:55:33 +10:00
silicons
0dcc6b44ba Merge pull request #14543 from qweq12yt/cargo-bugfixes
Cargo bugfixes
2021-04-18 18:52:54 -06:00
silicons
e8e625cb5c Merge pull request #14603 from Putnam3145/fix-base-option
Activity tracking; traitor class tweaks
2021-04-18 18:49:27 -06:00
DeltaFire
f1e1169e85 dispenser moment 2021-04-13 17:33:04 +02:00
Putnam
4811216f07 Activity tracking; traitor class tweaks 2021-04-13 06:42:32 -07:00
qweq12yt
7ca46715d7 Merge branch 'master' into cargo-bugfixes 2021-04-08 19:15:55 -03:00
SandPoot
29bf226fe1 upload closets.dm 2021-04-06 18:18:08 -03:00
silicons
cbd7e0de6a Merge pull request #14418 from LetterN/perlin-genny
Updates openspace & enables perlin generation on alvaland & icebox/snaxi
2021-04-06 04:10:00 -06:00
BlueWildrose
de6b3552d5 that grammar would make me mad if I left it there why did I do that 2021-04-05 22:59:24 -07:00
Blue Wildrose
80e9437390 add some game logging for good measure 2021-04-05 21:47:15 -07:00
Blue Wildrose
fb79a2033d usr.name into user, also adding in do_after. 2021-04-04 21:34:27 -07:00
Lin
c65b1791d0 Merge pull request #14547 from SandPoot/lockers-and-laptops
Fixing some issues for laptops and lockers/crates.
2021-04-04 23:22:41 -05:00
Blue Wildrose
414d9d43e3 adding a gap here 2021-04-04 18:50:11 -07:00
Blue Wildrose
43d855c413 Killable space pirate sleepers 2021-04-04 17:05:18 -07:00
SandPoot
2381db5f53 upload files 2021-03-31 12:35:43 -03:00