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 |
|
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 |
|
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 |
|
Putnam
|
68ad5c2e5c
|
disposability
|
2021-03-30 23:56:12 -07: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 |
|
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 |
|
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
|
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
|
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 |
|
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 |
|
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 |
|
keronshb
|
b06c15ab30
|
Update traitordevices.dm
Fixed
|
2021-03-24 21:32:31 -04:00 |
|
necromanceranne
|
45340ef1ac
|
Makes shove off-balancing remove any active item, not just guns. Makes baton knockdowns not go on cooldown from normal hits, makes baton offbalance trait share a duration. Gives the stunprod a little more oomph to keep it comparable to unarmed.
|
2021-03-25 09:27:33 +11: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 |
|
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 |
|
silicons
|
5910950a49
|
Merge pull request #14473 from ItzGabby/bark-box
Bark Box Remastered Edition
|
2021-03-22 21:15:14 -06: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 |
|
Putnam
|
f1e55f2df0
|
Paranoid updates to maybe fix air duplication
|
2021-03-20 22:02:47 -07:00 |
|
keronshb
|
0b5cedf893
|
patches out a radioactive microlaser tech, makes radioactive microlasers not knock out rad-immune creatures (#57380)
|
2021-03-20 20:40:51 -04:00 |
|
silicons
|
1fd06a89b7
|
Oh Boy
|
2021-03-20 16:27:52 -07:00 |
|
silicons
|
02b52e6142
|
framework
|
2021-03-20 16:02:26 -07:00 |
|
silicons
|
efa4139aff
|
math fix
|
2021-03-20 14:17:13 -07:00 |
|
silicons
|
5b2a42f254
|
Merge remote-tracking branch 'citadel/master' into combat_v7
|
2021-03-20 14:13:23 -07:00 |
|
silicons
|
427919d147
|
whew
|
2021-03-20 13:57:48 -07:00 |
|
silicons
|
604a6efeca
|
baton change
|
2021-03-20 13:45:39 -07:00 |
|
silicons
|
15dd80a085
|
less awful
|
2021-03-20 13:39:59 -07:00 |
|
silicons
|
6491615775
|
Merge pull request #14461 from Hatterhat/violent-cafe
removes pacifism from ghost cafe
|
2021-03-20 14:28:33 -06:00 |
|
silicons
|
a1c4323653
|
Merge pull request #14457 from GrayRachnid/holopads
Fixes the bug that allows anybody(other than heads) to auto-call holopads and adds secure holopads.
|
2021-03-20 14:28:07 -06:00 |
|
LetterN
|
292f67e098
|
Merge remote-tracking branch 'origin/master' into perlin-genny
|
2021-03-20 20:36:56 +08:00 |
|
Lin
|
a9a5bdc61a
|
Merge pull request #14471 from Citadel-Station-13/silicons-patch-9
fixes being able to reach into closed bodybags (couldn't webedit 2 files in one PR without being not lazy)
|
2021-03-19 21:08:39 -05:00 |
|
necromanceranne
|
6a752cfd5d
|
Not quite right
|
2021-03-20 04:28:20 +11:00 |
|