cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-31 20:53:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,353 Commits 26 Branches 2 Tags
79b73966e8564241c63cfdd672402cd34376a7e4
Commit Graph

1852 Commits

Author SHA1 Message Date
Tigercat2000
9186d94ba1 Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark 
Conflicts:
	icons/mob/suit.dmi
 2015-11-11 16:51:44 -08:00
Fox-McCloud
bfac0b62fa Ports TG Pneumatic Cannon 2015-11-09 22:54:05 -05:00
Fox-McCloud
318c464f94 Aquarium Starter Kit 2015-11-08 07:38:09 -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
Fox-McCloud
2335c6be9d Merge remote-tracking branch 'upstream/master' into barber-update 2015-11-06 06:30:59 -05:00
Fox-McCloud
17112cda3d barber update 2.0 2015-11-05 06:51:00 -05:00
Fox-McCloud
40a5abbb4a Barber Update 2015-11-05 02:04:46 -05:00
Fox-McCloud
4687620436 Adds Random Cigs 2015-11-04 22:47:18 -05:00
Tigercat2000
6c020780d9 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
 2015-10-29 19:29:28 -07:00
Tastyfish
d0a16cb489 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-10-28 19:02:27 -04:00
Tastyfish
6fc9950e45 Gave space cash a proc get_total() to return value of stack, and fixed richest escapee scoreboard line to actually get bank account (was ref'ing phantom var) and get cash amount correctly. 2015-10-28 18:49:14 -04:00
Fox-McCloud
a404929d16 Multiverse Sword 2015-10-21 23:59:59 -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
33220548fc Fixes a Lipstick Runtime 2015-10-18 03:40:21 -04:00
Fox McCloud
d6cb0f9075 Merge pull request #2365 from Crazylemon64/apc_autolathe 
APC electronics refactor
 2015-10-15 16:03:08 -04:00
Crazylemon
3c3f51401b Cuts out all the old weapon/module code 
Also lets drones collect intercom electronics, and gives the autolathe
an APC electronics recipe
 2015-10-13 21:13:49 -07:00
TheDZD
dd97cc261d Merge pull request #2343 from Fox-McCloud/game-mode-cleanup 
Removes Nations and Unused Gamemodes
 2015-10-13 21:34:49 -04:00
Fox-McCloud
46f9f68f31 more de-referencing 2015-10-12 04:18:49 -04:00
Fox-McCloud
9795dc761b Removes Nations and Unused Game Modes 2015-10-11 19:51:19 -04:00
Fox-McCloud
a2db4d118a why bay and tg why 2015-10-10 09:07:25 -04:00
Fox-McCloud
4c5706bc3a more...fixes 2015-10-10 08:52:35 -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
69d7a7ed1d Axes Some Pooling 2015-10-08 01:26:15 -04:00
Fox McCloud
18a19df30f Merge pull request #2292 from tigercat2000/fancy 
-tg- style inventory update, stripping update
 2015-10-06 18:49:08 -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
Markolie
bff7a9a80c Replace _color with item_color 2015-10-05 19:55:14 +02:00
Tigercat2000
8c97846746 -tg- style inventory update, stripping update 
This commit does the following:
 - Updates a few of our inventory procs to -tg-'s latest
 - Nukes the equip_e system from orbit
 - Fancy UI for stripping people now
 - Nuked fucking kitten ears from their snowflakey bullshit update_icons
   shitty fuck fuck FUCK
 - NUKED FUCKING METAL DETECTORS AHHHHHHHHHHHHHHHHHHHHHHHHHH
 2015-10-04 16:53:48 -07:00
TheDZD
8181354ffc Merge pull request #2261 from Markolie/fixesfixesfixesfixesfixesfixes 
Fixes
 2015-10-02 15:50:23 -04:00
Markolie
e27f84df7d Dead people can emote! 2015-10-02 03:59:03 +02:00
Markolie
f6903f0152 Alien specific 2 2015-10-01 04:33:58 +02:00
Markolie
bb0bbdcf5a Alien claws fix 2015-10-01 04:27:59 +02:00
Markolie
d18b18b5b4 Syndicate borg update, add medical syndicate borg, energy sword refactor 2015-10-01 04:21:24 +02:00
Mark van Alphen
25f19dff0d Merge pull request #2204 from Fox-McCloud/belt-of-holding 
Ports NT Station's Belt of Holding Sprite
 2015-09-29 18:47:17 +02:00
Fox-McCloud
7586390436 Merge pull request #2146 from TheDZD/vision 
Shadowling, Changeling, and Vision Fixes/Changes
 2015-09-29 11:44:06 -04:00
TheDZD
6705006ee7 Merge pull request #2213 from Fox-McCloud/destroy-fixes 
Fixes a few Destroys
 2015-09-28 19:28:29 -04:00
TheDZD
19d8aa3d36 Merge pull request #2215 from Markolie/s2 
Fix flamethrower logs
 2015-09-28 19:03:45 -04:00
DZD
b990b6c71b Merge remote-tracking branch 'upstream/master' into vision 2015-09-28 19:03:14 -04:00
Markolie
6825c33cb9 Fix flamethrower logs 2015-09-29 00:51:17 +02:00
Fox-McCloud
be672419ca Fixes a few Destroys 2015-09-28 18:15:39 -04:00
Fox-McCloud
444c616d5a Ports NT Station's Belt of Holding Sprite 2015-09-27 23:43:41 -04:00
Markolie
dbbdf90670 Add missing c200 cash sprite 2015-09-28 05:03:19 +02:00
Mark van Alphen
48a3d1ab9a Merge pull request #2176 from Fox-McCloud/janicarts-and-janitors 
Janicart and Janitor Update
 2015-09-28 03:02:04 +02:00
Fox-McCloud
d7f23f4271 Oh, that kind of list 2015-09-27 19:39:09 -04:00
DZD
0ceaf664af Fix merge conflicts 2015-09-27 11:24:51 -04:00
Fox-McCloud
569758f4cb bluespace trashbag 2015-09-27 06:46:50 -04:00
Robertha89
495a5bfe31 Death Alarm Implant Kit change 
Add's a sixth implant, and removes the implantpad, as it is not needed for deathimplants.
 2015-09-26 19:29:48 +02:00
Fox-McCloud
4413911688 Janicart and Janitor Update 2015-09-26 06:17:29 -04:00
Markolie
d4e5149389 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fluff 
Conflicts:
	code/modules/mob/living/silicon/robot/drone/drone.dm
 2015-09-26 05:12:52 +02:00
Tigercat2000
4b6a3ddcb6 -tg- SpaceMove update 
This commit updates the spacemove system to -tg-'s; All objects now drift
in space, not just mobs. A few hardcoded space checks have been replaced
with has_gravity(); So it applies to zero-G as well as space.

Spacepods no longer drift, because their snowflakey shitcode just doesn't
work. So they just move.
 2015-09-25 15:53:59 -07:00