silicons
08cd9b1bfd
Merge pull request #14576 from SandPoot/another-locker-change-thing
...
Another closet change
2021-04-08 03:24:59 -06:00
silicons
b2fcded98d
Merge pull request #14577 from SandPoot/fixes-machines
...
Prevents machines that open from dropping their components
2021-04-08 03:24:51 -06:00
silicons
3416989b7c
Merge pull request #14552 from BlueWildrose/PillsHere
...
I could blot the sun out with these titty pills and some certain catgirls here STILL wouldn't be satisfied.
2021-04-08 03:23:32 -06:00
silicons
f1de2d37aa
Merge pull request #14535 from brokenOculus/adds-Telescopic-Baseball-bat
...
Adds telescopic baseball bat
2021-04-08 03:22:56 -06:00
SandPoot
c15852f47b
upload _machinery.dm
2021-04-06 19:27:52 -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
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
Eric
7a135d2346
Adds Telescopic bat to uplink Baseball bundle.
2021-04-03 17:11:06 -05:00
Eric
65bcb8fc35
removes bat attaching to belt
...
seems a little OP I guess?
2021-04-03 16:58:08 -05:00
Putnam3145
e509f1956d
Removed cloning destroy; removed commented-out objs ( #14539 )
2021-04-02 19:48:55 +02:00
BlueWildrose
5152a605d8
this is very warming
2021-04-01 11:36:30 -07:00
Blue Wildrose
fcd1080069
more booby and dick pill
2021-04-01 05:36:43 -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
Eric
81a222b90f
Update weaponry.dm
...
adds Telescopic baseball bat and its telescopic functionalities.
2021-03-28 22:29:23 -05:00
Lin
0f5d5522b0
Merge pull request #14431 from YakumoChen/ancient-bundle
...
Ports Ancient bundle from TG
2021-03-28 18:09:38 -05:00
Lin
130a76677b
Merge pull request #14527 from LetterN/yay-nullspace
...
Fixes order-of-nullspacing boards
2021-03-28 18:03:18 -05: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
silicons
3ffe980e35
Merge pull request #14486 from keronshb/radioactivemicroport
...
patches out a radioactive microlaser tech, makes radioactive microlasers not knock out rad-immune creatures
2021-03-27 01:36:19 -06:00
silicons
4f3e695afa
Merge pull request #14495 from Hatterhat/synth-aug
...
is it really an augmentation if you're using a synthflesh-grown limb? no, probably not, but what if you could
2021-03-27 01:35:54 -06:00
silicons
bdbb33842e
Merge pull request #14513 from Putnam3145/chaos-for-secret
...
Makes threat a subsystem instead of dynamic-attached
2021-03-27 01:33:27 -06:00
silicons
8a5d87725b
Merge pull request #14515 from CuteMoff/Plasmaispogtake2
...
Lets try again, Plasma Ingots (Fucked up the first time)
2021-03-27 01:32:47 -06:00
silicons
07484e53aa
Merge pull request #14516 from DeltaFire15/cc-headmessages-again
...
Once again makes all heads able to message centcom
2021-03-27 01:32:10 -06:00
silicons
bf382f490c
Merge pull request #14518 from necromanceranne/shield_explodies_fix
...
Shields: Changes, additional flags, bug fixes, sprites
2021-03-27 01:31:55 -06:00
LetterN
9c3c9861ab
null-too-early
2021-03-27 08:31:48 +08:00
SandPoot
0994a37af5
upload files
2021-03-26 11:05:36 -03:00
necromanceranne
2368968c66
Ports #42721 which happened to resolve this already
2021-03-26 08:45:14 +11:00
necromanceranne
84223c65f5
Adds the shield flags to the ratvaran shield, adds the remaining sprites for the kinetic/energy/holo shields
2021-03-26 07:07:48 +11:00
DeltaFire
1e7d4e4335
*snap
2021-03-25 16:53:25 +01:00
CuteMoff
dd295d20c2
Merge branch 'master' into Plasmaispogtake2
2021-03-25 10:44:12 -04:00
CuteMoff
3efce37fd9
Update mineral.dm
2021-03-25 10:32:13 -04:00
Putnam
899b94f0f3
Made threat a subsystem instead of dynamic-attached.
2021-03-24 23:44:37 -07:00
keronshb
b06c15ab30
Update traitordevices.dm
...
Fixed
2021-03-24 21:32:31 -04:00
silicons
0845840f5e
Merge pull request #14507 from CuteMoff/thisismydiamondsword
...
Added "Diamond Ingots" for Blacksmithing
2021-03-24 19:23:02 -06:00
necromanceranne
79de55c58c
First part of the largescale shield cleanup, including ensuring shields respect their various counters and strengths appropriately.
2021-03-25 09:07:52 +11:00
LetterN
e3fb2d5491
Merge remote-tracking branch 'origin/master' into perlin-genny
2021-03-24 21:55:47 +08:00
LetterN
cdf589d828
proper fix aoaooa
2021-03-24 13:26:43 +08:00
CuteMoff
ea200acd9f
Update code/game/objects/items/stacks/sheets/mineral.dm
...
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com >
2021-03-23 23:17:24 -04:00
CuteMoff
a51a1ae68f
Update mineral.dm
2021-03-23 21:24:11 -04:00
CuteMoff
048b8548ad
Update mineral.dm
2021-03-23 20:53:07 -04:00
CuteMoff
428591c452
Update mineral.dm
2021-03-23 20:36:48 -04:00
Lin
ebf652f736
Merge pull request #14472 from silicons/sigh_615
...
makes the global antag disable pref more clear. forces savefile update to default all players to having the **disable** *disabled* (i love double negatives).
2021-03-23 17:53:50 -05:00
silicons
5910950a49
Merge pull request #14473 from ItzGabby/bark-box
...
Bark Box Remastered Edition
2021-03-22 21:15:14 -06:00
Hatterhat
e5c01bc0f8
limbgrower limbs can be used in augmentations
2021-03-22 20:15:01 -05: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
