cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-02 13:42:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,477 Commits 26 Branches 2 Tags
bfca35a21399ccab8a586c1fb8530eecf16ecaec
Commit Graph

344 Commits

Author SHA1 Message Date
Fox McCloud
ab490f7fd9 Merge pull request #2903 from Aurorablade/OrganRefactor 
[HOLY SHIT!]Charlie, lets go to candy mountain, charlie
 2016-03-04 19:51:50 -05:00
Fox-McCloud
e2bb00a5b1 Miming Refactor 2016-02-28 22:40:00 -05:00
Fox McCloud
166b3951b8 Merge pull request #3676 from Aurorablade/ThePutsaNewShadeOnThings 
Fethas Carnival of horrors: A new shade for the detective
 2016-02-26 20:02:41 -05:00
Aurorablade
5f98feb0bc meanwhile as i driver tiger INSANE 2016-02-25 16:17:39 -05:00
Aurorablade
9a804ebd31 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-24 06:27:16 -05:00
Tastyfish
4f3ce4ecbc Adds picture frames 2016-02-21 21:00:45 -05:00
Aurorablade
2c38d8fb61 yeah 2016-02-21 05:54:10 -05:00
Aurorablade
545d3abf19 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-11 18:03:09 -05:00
VampyrBytes
de45fc9aba Cleans up slipping code 
Puts slipping into one proc rather than being dealt with individually by
each item.

The only changes to functionality here are where it would have been
possible to slip on some items whilst flying. It will make any changes
decided on in #3490 or any future changes far more easy to implement
 2016-02-03 09:44:32 +00:00
Aurorablade
25876fd036 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-02 15:35:54 -05:00
Tastyfish
511a9757de Renamed manifest section Support to Service 2016-01-28 22:30:45 -05:00
Tastyfish
ba2f797ed3 Adds Supply section to manifest 2016-01-28 21:12:20 -05:00
Aurorablade
51013b97c0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-15 08:10:24 -05:00
Fox-McCloud
38149bfc7d Merge remote-tracking branch 'upstream/master' into sec-rifle 2016-01-03 22:35:28 -05:00
Tigercat2000
31aab5452b -tg- smoothing/floor refactor 
Squashed:

Add plasteel goonplaque turf

Builtin_tile nulling

Levelupdate()

Fix falsewalls, update smoothing.dmm

fixes rwall decon
 2016-01-03 19:24:13 -08:00
Fox-McCloud
7830cd215b shotgun 2016-01-03 04:03:48 -05:00
Aurorablade
bd19dc6942 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-01 22:38:23 -05:00
Crazylemon
23e8b1277f Wave 2 of tweaks, probably needs a little more 
Ripped out the preferences_savefile.dm because it's obsolete and we
don't use it
 2015-12-27 06:32:25 -08:00
Aurorablade
1a70e9caf5 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2015-12-24 00:17:26 -05:00
Aurorablade
046b0b997d almost.... 2015-12-23 11:40:16 -05:00
Fox-McCloud
09dab6bdea EMP Fixes 2015-12-23 04:09:47 -05:00
Aurorablade
80eb828563 this shit dosen't even compile yet... 2015-12-19 22:39:47 -05:00
Fox-McCloud
ea11eaa387 Ports Wormhole Projector 2015-12-19 00:57:40 -05:00
Fox-McCloud
82312c9e52 Player Spider Fixes 2015-12-02 18:14:01 -05:00
Aurorablade
1e83404b80 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into FixyFixy 2015-11-24 21:17:35 -05:00
Aurorablade
677b38304d well this escalated quickly 2015-11-22 23:16:30 -05:00
Tastyfish
85d651b781 refactored datum/effect/system because it was a complete mess 2015-11-22 19:43:01 -05:00
TheDZD
bbab399d6e Merge pull request #2599 from Fox-McCloud/thanksgiving-food 
Thanksgiving Update
 2015-11-20 19:46:47 -05:00
Fox-McCloud
0e3a6a0857 map 2015-11-19 00:23:57 -05:00
Fox-McCloud
f43e21698c Updates 2015-11-18 23:17:31 -05:00
Fox-McCloud
bdd45eacdc Spiderling and Factions 2015-11-18 14:51:04 -05:00
Aurorablade
bc7a0864d5 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into TooSpoopy 2015-11-16 01:15:41 -05:00
Tigercat2000
29f42f8b61 Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/silicon/pai/life.dm
 2015-11-07 20:54:24 -08:00
Tigercat2000
67e20ff5d5 -tg- Life() refactors 
This commit does a *lot*
Main points of shit changed:
 - Breathing for carbons is now partially handled at a carbon/Life()
   level; Humans still use their species bullshit and all.
 - Most shit has been pushed up the chain to living/Life().
 - Simple_animals no longer use the fucking stupid Die() proc, they use
   death() like a consistant fucker.
 - Human vision is now handled via species.
 - Lots and lots of robot copypasta cleaned
  - AI is still a terrifying mess, not even -tg- touches it

I have tested this, and everything I thought to test worked:
 - Aliens breathing
 - Humans breathing
 - Human vision
 - Robot HUD
 - human HUD
 - Simple animals automatic systems
 - Simple animals dying properly
 - Robot goggles working
 2015-11-04 16:32:57 -08:00
Aurorablade
f5f7c0cde9 might not be doing this right but eh 2015-11-02 21:58:15 -05:00
Aurorablade
600d351950 added in gib subtype 2015-11-02 20:54:34 -05:00
Aurorablade
f9d96ffbf1 WIP commit 
still working on the camera thing..
 2015-11-01 01:19:35 -04:00
Aurorablade
570cfbe566 Spoopy 2015-10-29 12:32:38 -04:00
Tigercat2000
633a9e68b4 Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark 
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	 ^ This shit is haunted. It's conflicted on two branches for 0
	 reason, the automatic merge wouldn't work on the fucking end of
	 file.
 2015-10-19 16:13:51 -07:00
Fox-McCloud
9795dc761b Removes Nations and Unused Game Modes 2015-10-11 19:51:19 -04:00
Fox-McCloud
ec10abc480 Last Few Destroy Fixes 2015-10-10 00:16:31 -04:00
Fox-McCloud
e17c6bde22 Another del->qdel pass 2015-10-08 16:49:10 -04:00
Tigercat2000
545c38a79b Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark 
Conflicts:
	code/game/objects/items.dm
 2015-10-08 11:16:30 -07:00
Fox-McCloud
6d978232d5 Merge remote-tracking branch 'upstream/master' into stupid-triggers 2015-10-06 18:25:26 -04:00
TheDZD
9582db5f55 Merge pull request #2303 from Fox-McCloud/qdel-a-qdel 
Fixes a Useless Destroy
 2015-10-06 17:48:07 -04:00
Tigercat2000
4fc91429e5 Baystation Rigsuits 
This commit adds baystation's rigsuit system on top of our own hardsuits;
Our own hardsuits still function fine and are around, but these are
available to admins. Next commit will contain balancing and player
implementation stuff.
 2015-10-05 16:42:00 -07:00
Fox-McCloud
bf38828c18 Fixes a Useless Destroy 2015-10-05 18:34:07 -04:00
Fox-McCloud
9c3e6f1ecd Removes Update Triggers File 2015-10-05 16:14:38 -04:00
Markolie
bff7a9a80c Replace _color with item_color 2015-10-05 19:55:14 +02:00
Tigercat2000
ec2b31e435 Nuke wheelchair snowflake shit, fix the delay 2015-09-28 12:59:44 -07:00