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

2810 Commits

Author SHA1 Message Date
TheDZD
64533c3c56 Merge pull request #2535 from Fox-McCloud/snacks 
Snacks
 2015-11-14 18:25:05 -05:00
Fox-McCloud
c08959423c Snacks 2015-11-13 17:16:47 -05:00
Tigercat2000
1023727689 Fix UI issues, fix weird modkit list 2015-11-11 17:55:36 -08:00
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
b7e4dab0e3 Merge pull request #2369 from tigercat2000/hmm_fancy 
Radio NanoUI improvements
 2015-10-16 17:19:22 -04:00
Fox McCloud
d6cb0f9075 Merge pull request #2365 from Crazylemon64/apc_autolathe 
APC electronics refactor
 2015-10-15 16:03:08 -04:00
Fox McCloud
0db1f97c14 Merge pull request #2349 from tigercat2000/pda_nano 
PDA CSS, to make it look like the old PDAs.
 2015-10-14 17:34:31 -04:00
Tigercat2000
18f01ba2b3 Radio NanoUI improvements 
This commit does the following:
 - Adds radio coloring to the channel names, ex, security is red, service
   is green.
 - Removes the broken "Speaker:" part of headsets, if the purpose of
   on-off buttons is not clear enough, they shouldn't be using radios in
   the first place!
 2015-10-14 08:35:24 -07: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
6db6dcd3f1 flag 2015-10-13 19:14:25 -04:00
Tigercat2000
9398a3a92c Retro Toggle, more color tweaks 2015-10-12 13:38:22 -07:00
TheDZD
cbe21922ef Merge pull request #2346 from Fox-McCloud/suspicious-dereferencing 
More Dereferencing
 2015-10-12 16:36:14 -04:00
Fox McCloud
03e233f629 Merge pull request #2342 from Robertha89/master 
Fixes reagent scanner not showing time of death correctly
 2015-10-12 13:49:06 -04:00
Fox-McCloud
46f9f68f31 more de-referencing 2015-10-12 04:18:49 -04:00
Fox-McCloud
81cfcd7af3 More Dereferencing 2015-10-12 02:37:52 -04:00
Fox-McCloud
9795dc761b Removes Nations and Unused Game Modes 2015-10-11 19:51:19 -04:00
Tigercat2000
f51dd440e8 Nuke voidsuits, unnecessary 2015-10-11 15:35:47 -07:00
Robertha89
e2f91d4bd7 Fixes redundancy 2015-10-11 23:55:17 +02:00
Robertha89
b17b6a7225 Fixes my derp 2015-10-11 23:34:19 +02:00
Robertha89
b1e5c58867 Fixes reagent scanner not showing time of death correctly 2015-10-11 22:40:26 +02: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
Tigercat2000
514a09bf0c Fixes, Icons 2015-10-08 11:13:48 -07:00
Mark van Alphen
09c0f235e6 Merge pull request #2318 from Fox-McCloud/no-pools-allowed 
Axes Some Pooling of Specific Objects
 2015-10-08 19:28:38 +02:00
Fox-McCloud
69d7a7ed1d Axes Some Pooling 2015-10-08 01:26:15 -04:00
Fox McCloud
dddfff41b4 Merge pull request #2305 from tigercat2000/intelli_card_nano 
NanoUI Intellicards
 2015-10-06 23:35:01 -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
Fox McCloud
559b03bfeb Merge pull request #2297 from Markolie/itemcolor 
Replace _color with item_color
 2015-10-06 16:11:35 -04:00
Mark van Alphen
eee0753773 Merge pull request #2295 from tigercat2000/intercom_nanoUI 
Upgrade radios to NanoUI
 2015-10-06 20:22:29 +02: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
Tigercat2000
7e231f9ed5 NanoUI Intellicards 
This add NanoUI to IntelliCard's.
 2015-10-05 16:36:32 -07:00
Markolie
bff7a9a80c Replace _color with item_color 2015-10-05 19:55:14 +02:00
Tigercat2000
ec747b9f04 Size tweaks, less snowflakey syndieborg radio 2015-10-05 09:31:11 -07:00
Tigercat2000
9a6b5c2749 Upgrade radios to NanoUI 
Things changed:
 - All radios now use nanoUI
 - Syndicate mode for any radios with syndicate access!
 - Electropacks also upgraded, since they are technically radios
 - Fancy as a motherfucker
 2015-10-05 08:28:52 -07:00