cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-04 06:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,244 Commits 26 Branches 2 Tags
9f8ba253c90f45ad5e7901ac147154d7cd2c151b
Commit Graph

2246 Commits

Author SHA1 Message Date
SamCroswell
15a8b1d7d6 Merge Conflict Resolution 2016-07-16 18:47:18 -04:00
Fox McCloud
cb0973346b Merge pull request #4766 from Kyep/parole 
Parole
 2016-07-16 11:35:37 -04:00
TheDZD
9bf946b5b6 Merge pull request #5054 from Fox-McCloud/mining-tweaks 
Various Mining Tweaks
 2016-07-16 10:57:54 -04:00
TheDZD
0d51787dbb Merge pull request #5072 from Fox-McCloud/belt-fixes 
Belt Overlay Fixes
 2016-07-16 10:44:01 -04:00
Fox McCloud
b76e2d19e0 Merge pull request #5041 from DaveTheHeadcrab/plastique_is_fun 
Plastic Explosives Update
 2016-07-16 04:07:12 -04:00
Fox-McCloud
7751adcffc Belt Overlay Fixes 2016-07-16 02:06:02 -04:00
Fox-McCloud
e6c02e3a2c Merge remote-tracking branch 'upstream/master' into mining-tweaks 2016-07-15 23:16:00 -04:00
SamCroswell
0466499f86 Personal Crafting - Initial Commit 2016-07-15 16:25:37 -04:00
Fox McCloud
f7b298f68e Merge pull request #4895 from TullyBurnalot/ArmlessCuffs 
Armless Cuffing and Legless Legcuffing Sense-Making
 2016-07-14 23:30:38 -04:00
Fox-McCloud
0fb2bfd8f1 Various Mining Tweaks 2016-07-14 22:07:04 -04:00
TullyBurnalot
c8801b2ff5 Adds sanity check for non-carbon mobs 2016-07-15 00:46:28 +01:00
Fox McCloud
4d3b818232 Merge pull request #5048 from Chakirski/bug1 
Cigpacks Examine Fix
 2016-07-14 18:54:23 -04:00
SamCroswell
23a1d887f3 Better Target Bugfix 2016-07-14 15:51:20 -04:00
Chakirski
6c8fa9f688 cigs... 2016-07-14 10:45:52 -05:00
SamCroswell
d0b818cc1b My commit line is a mess at this point IDGAF 2016-07-14 01:45:21 -04:00
SamCroswell
8b94d840fb PLEASE SEND HELP 2016-07-14 01:44:40 -04:00
SamCroswell
a42dcebc21 Fixes a bug with the flash C4 2016-07-14 01:14:22 -04:00
Kyep
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
SamCroswell
890ae146ca Flashbang Explosives 2016-07-13 23:42:31 -04:00
SamCroswell
cf90405f56 Plastic Explosives Update 2016-07-13 22:04:23 -04:00
TheDZD
5ba6e17739 Merge pull request #4917 from TullyBurnalot/BureaucracyUpdate 
Bureaucracy Update
 2016-07-11 21:20:06 -04:00
TheDZD
66c8eb899e Merge pull request #4966 from Fox-McCloud/ntrep-cane 
Nanotrasen Rep Cane Tweak
 2016-07-11 20:59:34 -04:00
Fox McCloud
374b682bf7 Merge pull request #4990 from FlattestGuitar/pulse-stuf 
Fixes pulse shot cost.
 2016-07-11 20:46:22 -04:00
Mieszko Jędrzejczak
4751e0988c Fixes pulse shot cost. 2016-07-11 19:52:24 +02:00
monster860
009dcaa2d8 Merge branch 'master' into w_class 2016-07-10 09:29:12 -04:00
Fox-McCloud
0ef31800b7 whoops 2016-07-09 22:50:05 -04:00
Fox-McCloud
9a8b9a29ee Nanotrasen Rep Cane Tweak 2016-07-09 22:41:46 -04:00
Fox McCloud
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
monster860
3df85518e1 Removes .0 at the end of w_class numbers 2016-07-08 12:26:34 -04:00
Kyep
dd8897fd22 Fixes merge conflict 2016-07-07 21:57:42 -07:00
Fox-McCloud
2e3d8bbbc6 Merge remote-tracking branch 'upstream/master' into hit-reactions 2016-07-07 22:50:53 -04:00
Tigercat2000
71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
Fox McCloud
277c3216d1 Merge pull request #4797 from TheDZD/GENETICS-PLAYER-ANGRY-GENTICS-PLAYER-SMASH!!! 
Re-Adds Instability
 2016-07-07 22:26:58 -04:00
Fox-McCloud
14cfc90ff9 TG Hit Reaction Port+Armor Fixes 2016-07-07 21:17:03 -04:00
TullyBurnalot
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
Krausus
d6dd9075f3 Fixes agent ID HTML not updating 2016-07-07 10:21:58 -04:00
Krausus
783536d278 Replaces ID photos with bicons 2016-07-07 01:25:56 -04:00
TheDZD
2df88fcdb5 Fixes and changes 2016-07-06 21:49:26 -04:00
Fox McCloud
7f5c764516 Merge pull request #4896 from Krausus/RuntimeFixes-20160705181950 
Runtime Fixes
 2016-07-05 23:45:15 -04:00
Krausus
b37cecbeae Fixes various runtimes (squashed) 
- Fixes runtime in pod lock busters
- Fixes possessed object examination runtime
- Fixes runtime when following a destroyed mob
- Fixes to_chat runtimes from involuntary emotes
- Fixes runtimes from invalid clothing IDs
- Fixes runtime caused by wirecutting non-humans
- Fixes runtime when setting up malf AI antaghuds
- Fixes runtimes in sensory destruction reagents
- Fixes runtime caused by clientless ghosts
- Fixes antag hud runtime in autotraitor generation
- Fixes welding tool shutoff runtime
- Fixes runtime in laptops' welcome program
- Fixes to_chat runtime from mech sound effect
- Fixes runtimes in camera-using NanoUIs
- Fixes to_chat runtimes in resisting held mobs
- Fixes headless mob skeletonizing/husking runtimes
- Fixes non-mob add_logs runtime
 2016-07-05 23:30:01 -04:00
TullyBurnalot
83d40f19ea Armless Cuffing Makes Sense Now 
This was entirely DZD's work. It has my name on it because it was a
"learn-as-you-code" experience.

Regardless:

- Can now cuff people with two hands, or one hand;
- Can no longer cuff people with no hands
 2016-07-06 02:20:40 +01:00
Isaac Erwin
1b8c43b840 The mop now stores 40 units of water instead of having unlimited water, water must be recharged at a cyborg recharger or in a mop bucket 2016-07-04 19:19:16 -04:00
Isaac Erwin
6fd7f5741f Changes the janiborg's mop into an advanced mop with limitless water 
Now the mop is potentially actually useful. How does it get water?
Bluespace, of course.
 2016-07-03 16:16:26 -04:00
TheDZD
9e5fc84bb9 Merge pull request #4845 from Fox-McCloud/armor-rebalance 
TG Armor Rebalance
 2016-07-02 19:26:41 -04:00
Fox-McCloud
85384036e9 tweak 2016-07-02 14:10:16 -04:00
Fox-McCloud
d98af32ce1 Fixes a Few Non-Respected Shields 2016-07-02 02:42:25 -04:00
Fox-McCloud
1dc331b5a4 TG Armor Rebalance 2016-07-01 18:35:01 -04:00
TheDZD
3a262b7a67 Merge pull request #4777 from Kyep/mindshield 
Renames Loyalty implants to Mindshield implants
 2016-06-30 12:03:03 -04:00
Ronald T. Mullins III
7e9ff08ceb bandolier_fix2 (#4807) 
* bandolier_fix2

I'm dumb. Bandolier should update_icon with New()

* Update belt.dm
 2016-06-28 23:44:30 -04:00
Kyep
3183192c27 Tigercat, Tigercat, does whatever a Tigercat does 2016-06-27 22:05:37 -07:00