Commit Graph

1479 Commits

Author SHA1 Message Date
silicons
fe8323f503 Merge pull request #14747 from keronshb/reinforcedplasmawindowsteps
Adds more deconstruction steps to stronger windows.
2021-06-09 11:13:13 -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
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
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
LetterN
f976a89157 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-31 08:19:31 +08:00
qweq12yt
04f90b749f fixes material crates not shipping 2021-03-30 12:33:23 -03:00
silicons
2a7aa8e826 Merge pull request #14524 from SandPoot/borgs-buff
Allows borgs to move pulled stuff around like a human
2021-03-28 13:48:14 -06:00
silicons
f269a8d35f Merge pull request #14274 from timothyteakettle/disguise
lets ghost cafe residents disguise themselves as any mob or object
2021-03-27 01:37:09 -06:00
SandPoot
0994a37af5 upload files 2021-03-26 11:05:36 -03:00
LetterN
e3fb2d5491 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-24 21:55:47 +08:00
Lin
715f86ef5c Merge pull request #14447 from LetterN/fixes-2
Fixes laptop and tweaks stacks
2021-03-22 19:52:42 -05:00
Lin
4e641eedb9 Merge pull request #14489 from LetterN/amogus
Fixes NIRM
2021-03-22 15:37:56 -05:00
LetterN
760a7de229 Merge remote-tracking branch 'origin/master' into fixes-2 2021-03-22 09:32:21 +08:00
LetterN
86b8bbf727 no more free shipping 2021-03-21 21:44:04 +08:00
silicons
6491615775 Merge pull request #14461 from Hatterhat/violent-cafe
removes pacifism from ghost cafe
2021-03-20 14:28:33 -06:00
LetterN
292f67e098 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-20 20:36:56 +08:00
silicons
d434f60cb3 Update closets.dm 2021-03-18 16:59:03 -07:00
Hatterhat
dd44ebae46 peak funny 2021-03-17 16:10:32 -05:00
LetterN
228105b391 laptop and closet decon fix 2021-03-16 14:47:28 +08:00
necromanceranne
6ebc911937 Batons knockdown and slowdown on rightclick, otherwise they stagger, but always do damage. Damage respects melee armor, but power cells grant armor pen based on max charge. 2021-03-16 04:48:55 +11:00
silicons
5472186bc2 Merge pull request #14398 from LetterN/post-hardsync1.5
post-hardsync1.5
2021-03-14 23:30:26 -06: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
Letter N
59a725c25a icon(s) fixes and fixes boards 2021-03-10 11:26:33 +08:00
silicons
58b69786c8 Merge pull request #14358 from Hatterhat/femur-breakies
femur breaker actually breaks legs any%
2021-03-09 00:18:41 -07:00
Letter N
22b33d1a6e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-07 13:04:36 +08:00
Hatterhat
9b2d62b9ef whoops again 2021-03-02 22:09:38 -06:00
Hatterhat
dc5ca7a556 oops 2021-03-02 22:07:13 -06:00
Hatterhat
053f9ea857 any% 2021-03-02 22:06:57 -06:00