cb0973346b
Merge pull request #4766 from Kyep/parole
...
Parole
2016-07-16 11:35:37 -04:00
9bf946b5b6
Merge pull request #5054 from Fox-McCloud/mining-tweaks
...
Various Mining Tweaks
2016-07-16 10:57:54 -04:00
0d51787dbb
Merge pull request #5072 from Fox-McCloud/belt-fixes
...
Belt Overlay Fixes
2016-07-16 10:44:01 -04:00
744777a944
Merge pull request #4971 from monster860/datum_browserify
...
Makes a bunch of UI's use /datum/browser
2016-07-16 08:52:18 -04:00
e32418956e
open(0)
2016-07-16 08:27:37 -04:00
b76e2d19e0
Merge pull request #5041 from DaveTheHeadcrab/plastique_is_fun
...
Plastic Explosives Update
2016-07-16 04:07:12 -04:00
7751adcffc
Belt Overlay Fixes
2016-07-16 02:06:02 -04:00
e6c02e3a2c
Merge remote-tracking branch 'upstream/master' into mining-tweaks
2016-07-15 23:16:00 -04:00
66d7b89d9a
Merge pull request #4838 from FalseIncarnate/paradise_pop
...
Paradise Pop
2016-07-14 23:58:24 -04:00
f7b298f68e
Merge pull request #4895 from TullyBurnalot/ArmlessCuffs
...
Armless Cuffing and Legless Legcuffing Sense-Making
2016-07-14 23:30:38 -04:00
0fb2bfd8f1
Various Mining Tweaks
2016-07-14 22:07:04 -04:00
c8801b2ff5
Adds sanity check for non-carbon mobs
2016-07-15 00:46:28 +01:00
4d3b818232
Merge pull request #5048 from Chakirski/bug1
...
Cigpacks Examine Fix
2016-07-14 18:54:23 -04:00
23a1d887f3
Better Target Bugfix
2016-07-14 15:51:20 -04:00
6c8fa9f688
cigs...
2016-07-14 10:45:52 -05:00
d0b818cc1b
My commit line is a mess at this point IDGAF
2016-07-14 01:45:21 -04:00
8b94d840fb
PLEASE SEND HELP
2016-07-14 01:44:40 -04:00
a42dcebc21
Fixes a bug with the flash C4
2016-07-14 01:14:22 -04:00
f22f5747cd
Deletes Parole Implants
...
Also deletes parole kit from warden's locker, as it is pointless now.
2016-07-13 21:44:50 -07:00
890ae146ca
Flashbang Explosives
2016-07-13 23:42:31 -04:00
cf90405f56
Plastic Explosives Update
2016-07-13 22:04:23 -04:00
dd2390d9bb
Merge pull request #4987 from Fox-McCloud/cyborg-tweaks
...
Cyborg Upgrade Additions and Refactor
2016-07-12 21:22:57 -04:00
5ba6e17739
Merge pull request #4917 from TullyBurnalot/BureaucracyUpdate
...
Bureaucracy Update
2016-07-11 21:20:06 -04:00
66c8eb899e
Merge pull request #4966 from Fox-McCloud/ntrep-cane
...
Nanotrasen Rep Cane Tweak
2016-07-11 20:59:34 -04:00
ca7530f58d
Merge pull request #4968 from Fox-McCloud/blood-refactor
...
Blood Refactor+Fixes
2016-07-11 20:57:25 -04:00
374b682bf7
Merge pull request #4990 from FlattestGuitar/pulse-stuf
...
Fixes pulse shot cost.
2016-07-11 20:46:22 -04:00
4751e0988c
Fixes pulse shot cost.
2016-07-11 19:52:24 +02:00
88468d2698
Fixes Borg Stun Arm Bypassing Shields
2016-07-11 10:45:50 -04:00
b7c71c7c76
differences
2016-07-11 09:23:43 -04:00
2a3ccf3729
Cyborg Upgrade Additions and Refactor
2016-07-11 06:16:44 -04:00
a61a2bdb53
Merge pull request #4973 from monster860/health_scanner_fix
...
Fixes health scanner not having closing tag on it
2016-07-10 15:38:54 -04:00
3552ed9608
Fixes health scanner not having closing tag on it
2016-07-10 14:38:09 -04:00
a97f0eaeea
Merge pull request #4952 from Fox-McCloud/borg-power
...
Borg Power Use Refactor
2016-07-10 14:23:37 -04:00
009dcaa2d8
Merge branch 'master' into w_class
2016-07-10 09:29:12 -04:00
10292105ad
Makes a bunch of UI's use /datum/browser
2016-07-10 09:19:14 -04:00
7165360832
Blood Refactor+Fixes
2016-07-10 02:58:00 -04:00
0ef31800b7
whoops
2016-07-09 22:50:05 -04:00
9a8b9a29ee
Nanotrasen Rep Cane Tweak
2016-07-09 22:41:46 -04:00
88a0482d27
Merge pull request #4688 from FreeStylaLT/maintgoodies
...
Adds a bunch of items to maint, Syndicate contraband included, tweaks probabilities.
2016-07-09 20:51:40 -04:00
405df28fab
Borg Power Use Refactor
2016-07-09 01:50:26 -04:00
3df85518e1
Removes .0 at the end of w_class numbers
2016-07-08 12:26:34 -04:00
dd8897fd22
Fixes merge conflict
2016-07-07 21:57:42 -07:00
2e3d8bbbc6
Merge remote-tracking branch 'upstream/master' into hit-reactions
2016-07-07 22:50:53 -04:00
71e5344a98
Mass replace
2016-07-07 19:34:02 -07:00
277c3216d1
Merge pull request #4797 from TheDZD/GENETICS-PLAYER-ANGRY-GENTICS-PLAYER-SMASH!!!
...
Re-Adds Instability
2016-07-07 22:26:58 -04:00
14cfc90ff9
TG Hit Reaction Port+Armor Fixes
2016-07-07 21:17:03 -04:00
2dce5ec8f1
Bureaucracy Update
...
- Added Fax Guide to NT Rep, IAA, Captain, HoS and HoP Lockers
- Added Tape Box, with 6 Tapes, to NT Rep and IAA Office
- Added Recorder to NT Rep Locker
- Printers now start off with 60 toner
- Printers now alert nearby people when butts are copied
2016-07-07 20:24:07 +01:00
d6dd9075f3
Fixes agent ID HTML not updating
2016-07-07 10:21:58 -04:00
783536d278
Replaces ID photos with bicons
2016-07-07 01:25:56 -04:00
2df88fcdb5
Fixes and changes
2016-07-06 21:49:26 -04:00
Fox McCloud