Commit Graph

6927 Commits

Author SHA1 Message Date
Fox McCloud
5701ea7c75 Ports Nano UI to Subsystems 2018-03-26 23:59:52 -04:00
tigercat2000
338631744f Merge pull request #8798 from Fox-McCloud/fire-subsystem
Ports over Fires to Subsystems
2018-03-25 16:02:31 -07:00
Fox McCloud
7a548473d4 name 2018-03-25 18:52:06 -04:00
Matthew Kelley
f0784af617 Resets borg special vision when reset 2018-03-24 01:29:00 -05:00
Fox McCloud
ae53aa1d21 Ports over Fires to Subsystems 2018-03-23 18:03:27 -04:00
Fox McCloud
bc7d9aa02d Merge pull request #8723 from tigercat2000/SMC
StonedMC
2018-03-23 16:48:34 -04:00
MINIMAN10000
68ff13fe3a Add "One access" to non secure windoor #5973
Secure windoor has conditions for "One" and "All" access but default windoor only has "All" access. This adds "One" and "All" access to default windoor. Fixes #5973
2018-03-22 20:25:37 -07:00
tigercat2000
b14faa19c3 Merge remote-tracking branch 'upstream/master' into SMC
# Conflicts:
#	code/__DEFINES/flags.dm
2018-03-22 15:35:12 -07:00
tigercat2000
b1278de3d2 Merge pull request #8674 from uraniummeltdown/attacks
[READY] Attack Code Update
2018-03-22 11:55:53 -07:00
alexkar598
bcae1222e1 i should of kept it as it was huh 2018-03-20 19:25:43 -04:00
alexkar598
df70fc1b6d whoopsy 2018-03-20 17:26:32 -04:00
alexkar598
13d02eb490 makes stun prods great again 2018-03-20 17:21:21 -04:00
tigercat2000
50f9d695a5 Merge pull request #8124 from Aurorablade/Dreams
Byond the wall of sleep
2018-03-19 13:42:00 -07:00
tigercat2000
5a756ad3c9 Merge pull request #8708 from Birdtalon/nanocalcium
Nanocalcium: Bone repair drug.
2018-03-19 13:37:20 -07:00
tigercat2000
7bee9ab6dc Merge pull request #8761 from IK3I/WrathOfSinguloth
Bags of bags of holding no longer possible.
2018-03-19 11:54:52 -07:00
IK3I
e9f3ee5cf5 No. 2018-03-13 22:48:23 -05:00
tigercat2000
c4d4c3e23a Merge pull request #8733 from PigeonLord/nabber
Added Medical Marijuana Packets for the Psychologist
2018-03-13 04:58:04 -07:00
tigercat2000
27314fded9 Merge pull request #8752 from Citinited/pipes-exploit-fix
Restricts RPD use to certain turf types
2018-03-13 04:57:15 -07:00
Citinited
6441dde560 Removes some obsolete code 2018-03-12 19:20:15 +00:00
Citinited
4bba349cb6 Adds RPD_ALLOWED_HERE flag to deny use of the RPD to certain turf types 2018-03-11 03:44:42 +00:00
Piccione
81f12bf186 Added a Tape Recorder and a box of tapes to the Detective's Locker 2018-03-10 22:13:06 +01:00
Piccione
8799c0cf42 Put the correct drug id in the cigarette for THC 2018-03-08 23:24:33 +01:00
Piccione
35f1956db7 Switched the Space Drugs in the Weed Cigarettes with more healthy THC 2018-03-08 23:18:54 +01:00
Piccione
3bcc12bd94 Added Weed Packets 2018-03-06 22:22:10 +01:00
uraniummeltdown
b09e3ae6f6 spacing, src/loc consistency in playsound, reverted the weapon hitsound change, removed silicon/damage_procs.dm as it's unrelated and wasn't even included in the .dme, fixed some typos 2018-03-05 02:07:31 +05:00
uraniummeltdown
4c29377f86 addresses minor issues:
isobj changed to explicit istype /obj
added extra frames to blast door animation so it doesn't restart
removed ZAS vars from /door/, added missing vars to door subtypes
adjusted layers of doors, removed layer varedits on maps
2018-03-04 13:52:56 +05:00
uraniummeltdown
a2038d40b3 makes door code more OOP: reduced copypasta in shutter and poddoor code, they have their own icon files, changed name of icon_states in the maps
added a few defines and helpers
do_after family supports callbacks
added airlock security levels to airlocks
obj_integrity for doors, door assemblies, firelock frames
vault door assembly is 8 plasteel up from 6
explosion_block works better
heavy firelocks block explosions, firelock (de)construction uses crowbar instead of welder
xenos can open airlocks
minor change to attacking obj message
2018-03-04 13:52:55 +05:00
uraniummeltdown
8f26d5b8b6 rename __DEFINES/mob.dm to __DEFINES/mobs.dm
make environment_smash into bitflags
add obj_damage for simple animals
make default max_integrity and obj_integrity INFINITY for non-defined objects, until we can move more objects to obj_integrity/take_damage() system
adds examining objects to roughly check damage
more obj_defense.dm procs
tables can be attacked with items, glass tables have a narsie_act()
fixes, changes to make it compile
2018-03-04 13:52:55 +05:00
uraniummeltdown
946ae0d58d moves var/list/armor to /obj level
adds armor to many objects
re-adds the clockcult floor sprite (accidentally removed in another PR)
adds clockcult effects to the clockcult floor
adds clockcult grilles
adds var/broken to /obj/structure
adds unused resistance_flags var
moves burn_state and resistance_flags to flags.dm
more updates to attack code
updated obj_defense.dm procs
2018-03-04 13:52:54 +05:00
uraniummeltdown
b76f8d2c35 new attack procs
minor fixes to make it compile
cleans up the code
2018-03-04 13:52:54 +05:00
uraniummeltdown
d6a277a224 fix incorrect match path
can butcher with any sharp item on harm intent
simple_animal/attacked_by()
moved var/foldable to box level
some fixes with attack code
updated slime code, can now mousedrop as a slime to feed on mobs
adds sound to simple_animal/attackby
2018-03-04 13:52:53 +05:00
uraniummeltdown
01551ec248 refactor match and lighter code to use procs, some code cleanup
lighting mobs on fire with a match is now logged
2018-03-04 13:52:53 +05:00
uraniummeltdown
e6ded64e4a adds /mob/living/proc/attacked_by()
updates attack and defense code
adds missing sounds to some items, code cleanup, lowered volume for some sounds (from /tg/)
hitsound and attack_verb updates, weapons given hitsound on New() according to damage type
2018-03-04 13:52:52 +05:00
tigercat2000
693e188362 Merge pull request #8583 from FalseIncarnate/coffee
Coffee Mugs and Vendor Change
2018-03-03 10:32:54 -08:00
tigercat2000
2887c4a62f Merge pull request #8710 from Birdtalon/pschye-toys
A few more things for the Psyche locker.
2018-03-03 09:59:40 -08:00
tigercat2000
dca16e60cf PS -> SMC Ports: LINDA, Spacedrift, Throwing
This commit ports LINDA, spacedrifting, and throwing to the SMC.
2018-03-02 23:58:57 -08:00
Birdtalon
7283431211 descriptions updated by request 2018-02-27 15:13:41 +00:00
Birdtalon
3787190fb4 changes for loop 2018-02-27 14:29:37 +00:00
shugnk
bbd681e369 Manuals.dm fix
Fixed Dat descriptions and Iframes. Also fixed nanotrasen letter case
2018-02-25 20:02:48 -05:00
shugnk
a0d65887b3 Delete manuals.dm 2018-02-25 20:01:20 -05:00
shugnk
cd90c3a328 fix again 2018-02-25 19:55:08 -05:00
shugnk
7325527024 Fix DAT and Iframes for Books
With NanoTrasen changed to Nanotrasen as well
2018-02-25 19:52:48 -05:00
Birdtalon
dd3c11a757 for loop 2018-02-23 22:28:29 +00:00
Birdtalon
904131be1e some more toys for psyche 2018-02-23 13:48:08 +00:00
Birdtalon
aa31461979 adds sound effect, reformats guide 2018-02-22 19:14:56 +00:00
Birdtalon
fe914dc5f5 finishes effects, adds nanocalcium auto-injector, adds bone repair kit to uplink. adds sprites. 2018-02-21 20:44:03 +00:00
Fox McCloud
010d8d5eca Merge pull request #8651 from uraniummeltdown/titaniummineral
Titanium
2018-02-21 03:20:20 -05:00
uraniummeltdown
edda7c9c52 make power tools and abductor tools use titanium 2018-02-21 11:09:47 +05:00
tigercat2000
f73c3c01d8 Merge pull request #8418 from Fox-McCloud/disco-inferno
Adds Dance Machine
2018-02-19 22:04:01 -08:00
tigercat2000
ff06bf8854 Merge pull request #8430 from Fox-McCloud/ied-buff
Buffs IEDs
2018-02-19 21:45:05 -08:00