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

5052 Commits

Author SHA1 Message Date
DZD
66688f4dbb Fixes conflicts in icons/obj/gun.dmi. 2015-07-24 15:29:20 -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
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
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
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
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
c81d7904c5 Merging Powernets into Machines 2015-07-15 03:36:35 -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
Aurorablade
6f1a7605a0 Bay Light, Sprite move 
added set light and moved spirtes back into mob.dmi
 2015-07-14 09:12:23 -04:00
Aurorablade
6abba693a7 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into CultistRave 2015-07-14 07:32:02 -04:00
Fox-McCloud
6cbdad58cf Sun Controller Scheduler Integration 2015-07-13 20:54:10 -04:00
Krausus
5d342baffb Fixes morgues and crematoriums (includes resisting) 
Fixes their trays breaking for 30 seconds, not logging cremations, not
being able to resist out of them, and all these damn uses of src.
 2015-07-13 07:31:48 -04:00
ZomgPonies
f4ea821829 Merge pull request #1496 from Fox-McCloud/LINDA-Pressure 
LINDA Pressure Changes
 2015-07-12 22:35:21 -04:00
Fox-McCloud
74f54a12e8 Merge pull request #1494 from tigercat2000/unfucklifeFUCK 
Clean up human Life()
 2015-07-12 19:41:29 -04:00
Aurorablade
2c677779d0 Adds cult glows to constructs taken from VG 
will put in mob.dmi when i am SURE its not gonna conflict on me
 2015-07-12 07:58:33 -04:00
Fox-McCloud
04511d3f0b Blob Mode Major Overhaul 2015-07-12 02:45:40 -04:00
TheDZD
90026bdec2 Merge pull request #1493 from Fox-McCloud/just-stop 
Changes a few del to del()
 2015-07-11 21:46:22 -04:00
Fox-McCloud
99bf49504a LINDA Pressure Changes 2015-07-11 06:28:03 -04:00
Fox-McCloud
f5ce957f33 qdel pass II 2015-07-11 02:10:31 -04:00
Tigercat2000
b295590cad Fix a few horrible mashed-together-operators in human Life() 2015-07-10 20:34:07 -07:00
Tigercat2000
c4494116a1 Fix a few color macros, one obsolete message, and some bad formatting 2015-07-10 20:32:30 -07:00
Fox-McCloud
e4d6acb538 Changes a few del to del() 2015-07-10 23:28:08 -04:00
Tigercat2000
059b405ac8 Un-relative-path human life.dm 2015-07-10 20:20:54 -07:00
DZD
3ed90434e0 Projectile, borg, and RnD fixes. 2015-07-10 21:36:23 -04:00
DZD
412443dbf1 Fix non-icon merge conflicts 2015-07-10 19:57:59 -04:00
DZD
d4cf433e7c Various fixes, changes, additions, and removal of old features. 
More changes
 2015-07-10 19:41:27 -04:00
Fox-McCloud
54f59b9899 Pass II 2015-07-09 19:51:40 -04:00
DZD
916f9bf4bb Sort of compiles 
Time to fix xenoarch, and then the map.
 2015-07-09 15:55:36 -04:00
Fox-McCloud
0dbea7621f The Great Del() Cull of 2015 2015-07-09 02:48:34 -04:00
DZD
b94c3deaf2 Initial Commit for -tg- Mining 
I can guarantee this will not compile, very much a WIP and currently
consists of mostly copy+pasting -tg-'s modules/mining folder over ours,
and unticking a few of our own files.
 2015-07-08 16:19:26 -04:00
ZomgPonies
737eb44b04 Merge pull request #1471 from Fox-McCloud/destroy-them-all 
Destroy Pass II
 2015-07-08 02:25:03 -04:00
ZomgPonies
8d5d97bd45 Merge pull request #1468 from SamCroswell/computerupdate 
Computer Lighting Update
 2015-07-08 02:23:58 -04:00
Fox-McCloud
0fd80d0b1f pass one fix 2015-07-08 01:09:10 -04:00
Fox-McCloud
9dc27ce126 Destroy Pass II 2015-07-07 22:26:28 -04:00
SamCroswell
f7cc10aae5 Telesci / Poly Update 2015-07-07 02:10:54 -04:00
Fox-McCloud
561e0c2268 pass 3 and cleanup 2015-07-07 01:32:40 -04:00
Fox-McCloud
88dfaa51a4 Replaces Reamining Del()'s 2015-07-07 00:35:19 -04:00
Tigercat2000
3a45d52fe0 Fix remaining non-returning Destroys() 
Plus a little refactor to mining flaps and spacepod doors- they now use
CanAtmosPass instead of manually setting the turf to no-atmos-passing
 2015-07-06 09:20:39 -07:00
Fox-McCloud
650580c0b6 Removes Unused/Non-functional Medical Side-Effects 2015-07-04 18:10:44 -04:00
Fox-McCloud
6fd8d83f4b Merge pull request #1431 from tigercat2000/bayholder 
Update mob holder code to bay's modular system.
 2015-07-02 14:42:14 -04:00
Chinsky
9a6f636815 Moved scooping into a seperate helper. 2015-07-01 09:31:54 -07:00
Fox-McCloud
62ef1cb7e2 TG Supermatter Port 2015-06-30 21:07:08 -04:00