Markolie
3c7413dc65
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into pet
...
Conflicts:
_maps/map_files/cyberiad/cyberiad.dmm
2015-09-22 00:17:30 +02:00
Markolie
f7234374b5
Update armour penetration checks
2015-09-21 22:54:26 +02:00
Markolie
ea305d3ffa
Saber SMG update, add armour piercing variable
2015-09-21 22:50:07 +02:00
Mark van Alphen
3510e6c863
Merge pull request #2104 from Fox-McCloud/spray-bottle-nerf
...
Spray Bottle Nerf
2015-09-21 02:10:43 +02:00
Mark van Alphen
44fc7e80e2
Merge pull request #2103 from Fox-McCloud/reagent-balance
...
Reagent Balance Tweaks
2015-09-21 02:10:36 +02:00
Mark van Alphen
467b51f3d2
Merge pull request #2102 from Fox-McCloud/reagent-skin-rework
...
Reagent Skin Penetration Rework
2015-09-21 02:10:26 +02:00
Fox-McCloud
be4607d70d
Spray Bottle Nerf
2015-09-19 09:09:01 -04:00
Fox-McCloud
9b5d15b0a6
Reagent Balance Tweaks
2015-09-19 08:48:10 -04:00
Fox-McCloud
705fb90b76
Reagent Skin Penetration Rework
2015-09-19 07:19:06 -04:00
Fox-McCloud
47d14c3b7e
Chemistry: Patch Balance
2015-09-18 22:33:40 -04:00
Mark van Alphen
739e820faa
Merge pull request #2078 from Fox-McCloud/experimentor
...
EXPERI-Mentor Addition--Telesci Removal
2015-09-18 07:18:55 +02:00
Fox-McCloud
02b0edb6ed
Fixes Reagents GCing and Runtimes
2015-09-17 03:00:05 -04:00
Fox-McCloud
d41b09c0a6
Experimentor Addition--Telesci Removal
2015-09-17 00:59:38 -04:00
Fox-McCloud
bef21a964d
Merge pull request #2068 from Markolie/lawstate
...
Welding tool refactor, in-hand updates
2015-09-16 19:07:29 -04:00
Mark van Alphen
d708ee8d84
Merge pull request #2058 from Fox-McCloud/cluster-grenade-cleanup
...
Cluster Grenade Cleanup
2015-09-16 20:22:38 +02:00
Fox-McCloud
cf21717a76
Merge pull request #2055 from Markolie/lesser
...
Switch spray admin messages to attack messages
2015-09-15 22:04:21 -04:00
Markolie
611cb16df8
Add torch, more in-hand fixes
2015-09-16 03:22:01 +02:00
Tigercat2000
c562680098
Merge remote-tracking branch 'origin/master' into bay_examine
...
# Conflicts:
# code/game/objects/structures/displaycase.dm
2015-09-15 14:08:36 -07:00
Fox-McCloud
844d203d0e
cleanup and restructure
2015-09-15 06:52:06 -04:00
Fox-McCloud
1979043d84
Cluster Grenade Cleanup
2015-09-15 00:04:57 -04:00
Markolie
90f722d752
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into intercom
...
Conflicts:
code/modules/projectiles/guns/projectile/automatic.dm
icons/mob/back.dmi
2015-09-15 04:18:27 +02:00
Markolie
fae3e78270
Switch spray admin messages to attack messages
2015-09-15 04:01:19 +02:00
Tigercat2000
0603f73232
Bay12 examine overhaul.
...
This commit overhauls the examine system to baystation's latest system,
including a more efficient verb approach, and a new status panel tab,
which shows more information for pre-defined objects.
2015-09-14 11:51:40 -07:00
Fox-McCloud
9d2dab6917
Reagents Performance and Garbage Collection
2015-09-14 04:49:29 -04:00
Fox-McCloud
3ce1e989ce
Materials Consistency Fix/Update
2015-09-13 17:49:36 -04:00
Markolie
ca6c7d10ba
In hand sprite overhaul
2015-09-13 22:44:18 +02:00
Fox-McCloud
f31bf75764
Blob Rebalance
2015-09-10 19:12:59 -04:00
Mark van Alphen
84b42c5491
Merge pull request #1986 from Fox-McCloud/nuke-and-tator
...
Nuke Ops and Traitor Update+Balance
2015-09-10 02:24:32 +02:00
Fox-McCloud
385dc0d47b
Space Cleaner Lighting Fix
2015-09-09 18:52:27 -04:00
Fox-McCloud
1c6c733a52
Nuke Ops and Traitor Update+Balance
2015-09-08 19:38:30 -04:00
Tigercat2000
ee32c0a35a
Merge branch 'master' into intent_define
...
Conflicts:
code/modules/reagents/Chemistry-Reagents.dm
2015-09-08 04:43:13 -07:00
Tigercat2000
f7f19eac59
Merge branch 'master' into reageaaaannntttttts
...
Conflicts:
code/modules/reagents/Chemistry-Reagents.dm
+ apply cleaner patch manually
2015-09-07 16:02:17 -07:00
TheDZD
8cb3ffaf58
Merge pull request #1956 from Fox-McCloud/perdy-colors
...
Space Cleaner Feature: Color Removal
2015-09-07 17:24:57 -04:00
Tigercat2000
be92665871
Replace magic intent words with defines, grab fixes
...
This commit does the following:
- Replaces all instances of magic intent words, like "harm" and
"help" with defines, I_HELP, I_DISARM, I_GRAB, I_HARM
- Fixes a few manual grab instances left over in attack_alien, they
will now used grabbedby()
2015-09-07 11:51:00 -07:00
Fox-McCloud
fc82cc6976
typo
2015-09-07 13:52:37 -04:00
Tigercat2000
e30ae7dbc3
Whoops, tabbing.
2015-09-06 21:04:51 -07:00
Tigercat2000
156bdb64c2
Split giant chemistry files into oldchem folder
...
This commit does the following:
- Removes relative pathing from:
- Chemistry-Holder.dm
- grenade_launcher.dm
- reagent_dispenser.dm
- Splits Chemistry-Reagents.dm into oldchem/reagents/
- Splits Chemistry-Recipies.dm into oldchem/chemical_reaction/
Another couple of huge relative-pathed files resolved.
2015-09-06 20:41:37 -07:00
Fox-McCloud
2214a8b455
R&D Update: Implants and Autolathes
2015-09-05 23:57:22 -04:00
Fox-McCloud
53516dfc4b
Space Cleaner Feature: Color Removal
2015-09-05 02:18:42 -04:00
Fox-McCloud
64b2bb3784
Merge remote-tracking branch 'upstream/master' into material-datums
2015-09-04 22:53:20 -04:00
TheDZD
07acac3bfd
Merge pull request #1944 from Fox-McCloud/cult-tweaks
...
Cult Tweaks
2015-09-04 22:01:11 -04:00
TheDZD
3515997a90
Merge pull request #1942 from Fox-McCloud/holy-water
...
Holy Water Rework
2015-09-04 21:58:59 -04:00
Fox-McCloud
ea6bfdf758
upgradeable recycler
2015-09-04 19:41:42 -04:00
Fox-McCloud
a019934e9e
Pass I
2015-09-04 05:18:48 -04:00
Fox-McCloud
ffb6708cca
metabolization
2015-09-03 22:15:45 -04:00
Fox-McCloud
f48c624d99
indent-fix
2015-09-03 22:04:04 -04:00
Fox-McCloud
e63cbd1e42
unholy water processing
2015-09-03 16:40:49 -04:00
Markolie
829441bd01
Fixes https://github.com/ParadiseSS13/Paradise/issues/1930
2015-09-03 22:20:26 +02:00
Fox-McCloud
9b8342897e
Cult Tweaks
2015-09-02 21:08:08 -04:00
Fox-McCloud
82103db931
Holy Water Rework
2015-09-02 17:24:51 -04:00
Markolie