cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-29 03:32:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,253 Commits 26 Branches 2 Tags
6180243d656231e19f092b2a129669c73e89c4fe
Commit Graph

17110 Commits

Author SHA1 Message Date
DZD
6180243d65 Minor changes 
- Changes asteroid wall sprites.
- Gives miners a styptic patch.
- Removes code that was previously commented out related to the
stationary mining drills.
 2015-07-28 13:07:24 -04:00
DZD
d64568e309 Adds the can_charge var to energy guns 
If set to 0, makes it so the gun cannot be charged in recharges. Set to
1 by default, only the nuclear (AKA advanced) egun and both plasma
cutters have it set to 0. (Nuclear egun was previously unable to be
charged, but used an istype check specific to it.)
 2015-07-24 16:02:13 -04:00
DZD
66688f4dbb Fixes conflicts in icons/obj/gun.dmi. 2015-07-24 15:29:20 -04:00
TheDZD
1cb5d4808c Merge pull request #1555 from Fox-McCloud/more-lighting-tweaks 
More Lighting Tweaks and Optimizations
 2015-07-24 11:05:04 -04:00
TheDZD
0d1248e976 Merge pull request #1552 from tigercat2000/ithinkibrokegrabs 
Number of grab fixes, other minor fixes related.
 2015-07-22 22:16:07 -04:00
Fox-McCloud
20099b254f More Lighting Tweaks and Optimizations 2015-07-22 18:20:21 -04:00
Fox-McCloud
0945859066 Merge pull request #1554 from Markolie/master 
Fix OneHuman law
 2015-07-22 16:57:23 -04:00
Markolie
4cfd1e4340 Fix OneHuman law 2015-07-22 18:35:09 +02:00
Tigercat2000
e9ba7cbca1 Fix a number of grab bugs and odd behaviour still around. 
This commit fixes a number of bugs with mob grabbing code.
Primary things fixed:
 - Aliens grabbing people will no longer break horribly, they call
   grabbedby like everything else now.
 - Any nulls that do manage to find their way into a grab list will be
   cleaned up by the next grab on that person.
 - Fixed a number of odd behaviours when grabbing xenomorphs, see
   bbcc19c764 for more details.
 - Fixed grabs having a tendency to shift someone's pixel_xy and not reset
   it when being deleted. This was simply because it previously relied on
   del() to stop all procs instantly.
 2015-07-22 05:33:26 -07:00
Tigercat2000
bbcc19c764 Fix aliens constantly resetting their pixel_xy and icon. 2015-07-22 05:30:01 -07:00
Tigercat2000
8cef88659e Made sure alien unEquip() bothered to pass arguments back in the parent call. 2015-07-22 05:29:14 -07:00
Fox-McCloud
c00baec937 Merge pull request #1549 from SamCroswell/ERTUpdate 
ERT Update
 2015-07-22 01:50:26 -04:00
PJB3005
d99ab0d2ac I think I just managed to fix all lighting lag. 2015-07-21 15:36:12 +02:00
SamCroswell
d84dfe5a49 ERT Rework - Code Changes 2015-07-20 19:37:56 -04:00
TheDZD
6ff8435545 Merge pull request #1541 from Fox-McCloud/minor-tweaks-for-uplink 
Minor Uplink Cost Adjustments
 2015-07-20 10:55:54 -04:00
TheDZD
8f2f2cb0a5 Merge pull request #1544 from Fox-McCloud/oh-no 
Fixes Blob Self Replication
 2015-07-19 17:15:02 -04:00
Fox-McCloud
0990a4ec5e Fixes Blob Self Replication 2015-07-19 15:50:27 -04:00
Fox-McCloud
4bae3f073b Reduces Blob's Lag 2015-07-19 09:56:38 -04:00
Fox-McCloud
fde654557c Minor Uplink Cost Adjustments 2015-07-18 21:54:32 -04:00
TheDZD
b858350c12 Merge pull request #1535 from Fox-McCloud/news-update 
News update
 2015-07-18 21:00:21 -04:00
Fox-McCloud
865d828976 Merge pull request #1538 from SamCroswell/ComputerFixes 
Computer Fixes
 2015-07-17 23:49:56 -04:00
SamCroswell
355666e1a8 Computer Fixes 2015-07-17 22:35:00 -04:00
Fox-McCloud
2004fd3be3 Merge pull request #1534 from SamCroswell/ClickUpdate 
Middle Click Override
 2015-07-17 22:13:57 -04:00
TheDZD
20441f0495 Merge pull request #1537 from Fox-McCloud/unlimited-bullets 
Fixes Unlimited Bullets
 2015-07-17 21:39:36 -04:00
Fox-McCloud
0524d49ff3 Fixes Unlimited Bullets 2015-07-17 19:36:14 -04:00
Fox-McCloud
df9ca1564d Fixes Immortal Blobbernaughts 2015-07-17 09:52:49 -04:00
Fox-McCloud
728dc57f30 Re-Enables News 2015-07-17 00:09:14 -04:00
TheDZD
1f789040b2 Merge pull request #1529 from Fox-McCloud/animate-a-shit 
Heavily Optimizes Lighting
 2015-07-16 21:59:28 -04:00
SamCroswell
73bf040ba4 Middle Click Override 2015-07-16 21:51:20 -04:00
TheDZD
fbbceac377 Merge pull request #1499 from Fox-McCloud/blob-update 
[Ready To Merge!]Blob Mode Major Overhaul
 2015-07-16 20:34:08 -04:00
Fox-McCloud
ba2127bf64 Drone Console Fix 2015-07-16 20:02:31 -04:00
Fox-McCloud
ca784c3772 Merge pull request #1530 from CrAzYPiLoT-SS13/master 
Holopad and binary talk
 2015-07-16 19:37:38 -04:00
Markolie
50210c6ff2 Enable malf AI jobbans 2015-07-17 01:06:05 +02:00
Markolie
0be9055d58 Fix Malf AI 2015-07-17 01:00:25 +02:00
Matt
a106daa447 Holopad and binary talk 
Fixes https://github.com/ParadiseSS13/Paradise/issues/1517 and
https://github.com/ParadiseSS13/Paradise/issues/1483 Aboot it
 2015-07-16 14:44:51 +02:00
Fox-McCloud
8302ab2e7f Heavily Optimizes Lighting 2015-07-16 08:10:54 -04:00
Fox-McCloud
c96e6fd7b8 proper check-antag 2015-07-16 03:33:38 -04:00
Fox-McCloud
8f89792c2a preventative measures 2015-07-16 03:00:40 -04:00
Fox-McCloud
5740d2e945 runtime fix 2015-07-16 01:26:20 -04:00
DZD
29e70854e9 Fix merge conflicts 
🖕 map conflicts over lines that weren't even edited by both upstream
and this branch.
 2015-07-15 22:28:12 -04:00
TheDZD
e55af53edb Merge pull request #1521 from Fox-McCloud/powernet-into-machines 
Merging Powernets into Machines
 2015-07-15 19:44:03 -04:00
TheDZD
0ff97aa42e Merge pull request #1522 from Fox-McCloud/fixin-dat-thing 
Power Computer and Computer Fixes
 2015-07-15 19:43:59 -04:00
Fox-McCloud
04204c2d30 forgot a thing 2015-07-15 18:35:29 -04:00
PJB3005
2b0ea0524f gotta go fast! 2015-07-15 17:22:56 +02:00
Fox-McCloud
5882cdf1e9 Merge pull request #1512 from Aurorablade/CultistRave 
[Sprites]Cultist rave AkA 'Fethas Stop making pull requests!'
 2015-07-15 09:07:42 -04:00
Aurorablade
7cce3bd3fc Rename proc 
updateiocn now updateglow
 2015-07-15 08:17:45 -04:00
Fox-McCloud
409fefa4b3 Power Computer and Computer Fixes 2015-07-15 07:00:46 -04:00
Fox-McCloud
c81d7904c5 Merging Powernets into Machines 2015-07-15 03:36:35 -04:00
Fox-McCloud
da8ac741e9 Merge pull request #1510 from Krausus/FurtherTrayedStructureFixes 
Further Morgue & Crematorium Fixes
 2015-07-14 19:56:56 -04:00
TheDZD
509ccbfd6d Merge pull request #1507 from Fox-McCloud/sun-rewrite 
Sun Controller Scheduler Integration
 2015-07-14 17:33:18 -04:00