variableundefined
c3de57a13f
Merge pull request #10973 from Jazz23/Potion-Fix
...
Adds mousedrop to speed/fire potions
2019-03-08 22:27:16 +08:00
Jazz23
e9827f8c96
Didn't know this function existed
2019-03-03 07:20:55 -08:00
Jazz23
df91eca51d
Can't be incapacitated
2019-03-02 09:09:21 -08:00
Dave
ebe99e8986
Applies what my mom taught me about conflict resolution
2019-03-01 18:51:04 -05:00
Jazz23
fbd861461d
Adds mousedrop to speed/fire potions
2019-03-01 15:29:19 -08:00
Fox McCloud
b8a9f127bf
Adds Upgraded Cybernetic Heart
2019-02-25 01:15:53 -05:00
xerdies
608d6f09c5
added ammo boxes, and added them to the materials so they can be printed.
2019-02-15 21:11:19 +00:00
Unknown
5ab0af3b25
Medical QoL PR
2019-02-15 00:10:08 -05:00
datlo
be99f5f8d9
fix angled walls icons, remove golem rune code
2019-02-04 14:06:37 +00:00
datlo
74a3631741
compilin and mostly workin
...
has runtimes due to body color
need to wrap up commented procs
2019-02-03 06:40:50 +00:00
Aurorablade
b812736517
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE
2019-01-19 23:35:15 -05:00
Aurorablade
4fc35a68b1
Gonna have to clean some files after this.
2019-01-19 22:38:47 -05:00
Jazz23
cdec3a53d2
Matching naming conventions.
...
All the other ones are like this.
2019-01-11 09:45:51 -08:00
Jazz23
5403e5afef
Bluespace Closet Addition
...
Heckin yes dude
2019-01-08 17:44:18 -08:00
variableundefined
c95f9b9c69
Merge pull request #10587 from TDSSS/irc-cost-increase
...
Added titanium cost to IRC chassis
2019-01-06 16:15:33 +08:00
variableundefined
72b237c246
Merge pull request #10530 from datlo/mechvoice
...
Adds mecha voice modification kits
2019-01-04 20:05:36 +08:00
TDSSS
96c3435767
Added titanium cost to IRC chassi
2019-01-03 20:04:32 +01:00
datlo
969a433f97
add syndicate tech requirement
2018-12-29 07:15:38 +00:00
uraniummeltdown
30b7621062
changed brpd design datum path
2018-12-28 13:24:52 +04:00
datlo
c026d533b1
fixed build path error, add power warnings
...
also put back attacked_by oof
removed syndicate tech requirement cuz eeeh it's just a voice, replaced
by titanium requirement
2018-12-27 20:13:22 +00:00
datlo
2625f70d87
added designs to fabricator, changed the check for install
2018-12-27 17:48:56 +00:00
datlo
b8f1858dd8
removed AEG toxin requirement
...
doesn't really make sense
2018-12-13 00:21:25 +00:00
datlo
fde4faed76
Made tanks empty, remove unnecessary tank types and added toxins tech requirement to AEG and welding gas mask
2018-12-12 23:31:43 +00:00
datlo
0c8d8ffaa8
fixes
...
readded toxins tech requirement to BRPD design, i thought it was the
item itself derp
fixed a bug where BRPD wouldn't make a beam if you clicked pipes
directly
added a period for consistency
2018-12-12 22:51:38 +00:00
datlo
5a3eb139c0
oof
...
removed toxins origin tech from BRPD
2018-12-12 21:54:57 +00:00
datlo
45ac02fcac
Adds toxin research
2018-12-12 21:35:13 +00:00
joep van der velden
09bac34890
fixed the rescue jaw not spawning... guys really?
2018-11-26 19:28:05 +01:00
tigercat2000
d02d1bd537
Robotic ears for I{P,R}C's, slime people don't need ear organs
2018-11-25 06:56:12 -08:00
Granodd
4b1ee1eeb6
Removing the mass spectrometer and replacing it with the reagent scanner.
2018-11-23 19:48:18 -05:00
datlo
8070b9f87a
change real names of some strange objects
2018-11-22 12:38:27 +00:00
warior4356
9be0a83269
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Drill
2018-11-08 01:58:53 -08:00
Fox McCloud
ecb9c11433
Updates Components Again
2018-11-02 16:23:46 -04:00
warior4356
0ee51bdcc2
Reverts maps. Fixes conflict.
2018-10-31 19:13:22 -07:00
warior4356
b6d5bccd54
Fixes code bugs
2018-10-31 17:32:35 -07:00
warior4356
13d927c10e
Drills implimented
2018-10-29 01:10:10 -07:00
variableundefined
4889c3a1a5
Merge pull request #9081 from tigercat2000/multivis
...
PiP Multivis
2018-10-25 09:45:02 +08:00
dovydas12345
a8b0bbae47
Better name and extra requirements!
2018-10-24 14:35:12 +03:00
tigercat2000
8ef1b97f45
Merge remote-tracking branch 'upstream/master' into multivis
...
# Conflicts:
# .travis.yml
# _maps/map_files/MetaStation/z2.dmm
# _maps/map_files/cyberiad/z2.dmm
# code/game/atoms_movable.dm
# code/game/machinery/camera/camera.dm
# code/modules/mob/living/silicon/ai/ai.dm
# code/modules/mob/living/silicon/ai/freelook/eye.dm
2018-10-23 17:41:41 -07:00
dovydas12345
45aab00dbf
Update misc_designs.dm
2018-10-23 22:22:17 +03:00
dovydas12345
3cfc7a42fe
Adds data disk to misc designs
2018-10-23 22:22:07 +03:00
variableundefined
600de8ba24
Deconflict 1
2018-10-21 07:56:55 +08:00
Mark Mak
690d7bd0d4
Merge pull request #9732 from TDSSS/ody-stuff
...
New mech equipment: Jaws of life for Ody/Firefighter Ripley
2018-10-19 06:54:38 +08:00
variableundefined
65c246c1c9
TG container_type refactor
2018-10-13 08:20:52 +08:00
variableundefined
4de5284557
Merge pull request #9677 from DesolateG/global
...
Updates global lists to the global var subsystem.
2018-10-12 13:18:28 +08:00
Desolate
f7627d2fcb
Resolves conflicts.
2018-10-11 05:36:22 -05:00
TDSSS
f205c03ea7
Spacing issues fixed
2018-10-11 09:12:52 +02:00
variableundefined
6b1b38d4f1
Port over tg ore stack and stack merging
...
Meta
Birbfix
Maxi
Re-add automatic satchel ore pickup (oops)
Mecha formatting
re
2018-10-09 10:06:03 +08:00
Purpose
4d7dd5a6c9
dayum dats defined
2018-10-08 22:48:00 +01:00
TDSSS
9d6e1bd051
rename, changed chem, replaced usr with user
2018-10-08 13:27:16 +02:00
Desolate
4c062212ab
refactors global lists.
2018-10-06 08:02:45 -05:00
