Commit Graph

4288 Commits

Author SHA1 Message Date
Matthew Kelley
f0784af617 Resets borg special vision when reset 2018-03-24 01:29:00 -05: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
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
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
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
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
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
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
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
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
Fox McCloud
1e1146cd21 changes 2018-02-20 00:33:22 -05:00
Fox McCloud
2de6875f60 Merge pull request #8626 from Citinited/flagged-for-review
Flag tweaks
2018-02-19 23:55:01 -05:00
Citinited
065965df0a Better way of handling icon_state code 2018-02-16 19:17:04 +00:00
Aurorablade
20ddaccb9b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DisMemberments 2018-02-08 02:31:44 -05:00
tigercat2000
93610061e0 Merge pull request #8590 from IK3I/RiseOfSpork
The Utensil of the future!
2018-02-05 12:49:59 -08:00
tigercat2000
ee894f887a Merge pull request #8556 from Tayyyyyyy/glowing_eswords
Esword visual update
2018-02-05 12:49:42 -08:00
uraniummeltdown
369c654c70 moves material defines to construction.dm
adds the titanium mineral, titanium [false]walls, titanium floors, titanium airlocks
adds plastitanium, plastitanium [false]walls, plastitanium floor
made survival pod wall a subtype of titanium wall
changes a few rnd recipes to use titanium
small refactor of ORM code, smelt titanium+plasma to plastitanium
shuttle windows have explosion block 3
2018-02-06 01:24:36 +05:00
Citinited
9929e01332 better way of handling chameleon flag icon_state 2018-02-02 14:27:54 +00:00
tigercat2000
d8a00048bd Merge pull request #8424 from uraniummeltdown/airlockoverlay
Airlock Overlays + Tweaks
2018-02-01 08:19:24 -08:00
Citinited
514d49340d Flag tweaks
-You can now roll up flags
-Fixes an issue with chameleon flags not correctly updating their icon
2018-01-31 20:55:10 +00:00
Fox McCloud
5c24e7720d Merge remote-tracking branch 'upstream/master' into disco-inferno
# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
2018-01-29 20:56:44 -05:00
Tayyyyyyy
eb19ebab4f Refactor to use light_power 2018-01-24 13:43:31 -06:00
IK3I
f94f77fc50 The Utensil of the future! 2018-01-23 18:45:55 -06:00
Tayyyyyyy
460cada461 Add light to flashbangs 2018-01-23 15:32:04 -06:00
FalseIncarnate
23c883bd57 Coffee Mugs and Vendor Change
Adds coffee mugs
- Available from hot drink vendors or loadout menu (1 point)

Adds novelty coffee mugs
- Available as a premium item from the hot drinks vendors or from the
loadout menu (2 points)

Adds support for an "item slot" in vendors, which allows an item to be
inserted into a vendor.

Adds the ability to add containers into the hot drinks machine.
- Will attempt to fill the inserted container with purchased beverages.
- Excess will still dispense in a new cup, as if there was not a
container present.

🆑
rscadd: Adds coffee and novelty mugs to the hot drinks machine and
loadout menu.
rscadd: Adds the ability to insert containers into the hot drink
machine, filling the container with your purchase.
/🆑
2018-01-22 22:46:03 -05:00
Tayyyyyyy
1729552e8e Toy dual eswords don't glow 2018-01-22 15:53:29 -06:00