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

4834 Commits

Author SHA1 Message Date
TheDZD
dc24c9b99d Merge pull request #2552 from tigercat2000/ugh_really 
WHEELCHAIRS ARE NOT SPORTS BIKES
 2015-11-15 11:59:28 -05:00
Fox McCloud
0b5875992b Merge pull request #2538 from Crazylemon64/miner_announce 
Additional Requests Console Functionality
 2015-11-15 08:17:20 -05:00
Tigercat2000
89b1472929 whoops not that slow 2015-11-14 21:17:53 -08:00
Tigercat2000
0a7225e8eb wheelchair speeds 2015-11-14 21:09:23 -08:00
TheDZD
64533c3c56 Merge pull request #2535 from Fox-McCloud/snacks 
Snacks
 2015-11-14 18:25:05 -05:00
Crazylemon64
1b4a39eb24 MULEbots notify on relevant deliveries 
Also:
	-Adds more request consoles throughout the map
		- Atmospherics, Brig Medbay, Warden, Security
 2015-11-14 14:29:24 -08: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
TheDZD
b72280c2e2 Merge pull request #2512 from Fox-McCloud/pneumatic-cannon 
Ports TG Pneumatic Cannon
 2015-11-11 09:52:16 -05:00
TheDZD
0e94e359f1 Merge pull request #2506 from Fox-McCloud/kitchen-changes 
Kitchen Updates
 2015-11-10 19:35:29 -05:00
Fox-McCloud
bfac0b62fa Ports TG Pneumatic Cannon 2015-11-09 22:54:05 -05:00
TheDZD
0aee56a1e7 Merge pull request #2501 from Fox-McCloud/plants 
Adds Additional Plant Sprites
 2015-11-09 20:16:00 -05:00
TheDZD
5d0677f714 Merge pull request #2500 from Fox-McCloud/fish-kit 
Aquarium Starter Kit
 2015-11-09 20:15:55 -05:00
Tastyfish
c9852cb34f Made it check for recursive buckling again too 2015-11-09 02:29:18 -05:00
Fox-McCloud
ab3ed53734 Kitchen Updates 2015-11-09 01:09:59 -05:00
Tastyfish
c91657477e Fixed buckling to check for someone already buckling correctly, and to tell subclasses that buckling was successful correctly 2015-11-09 00:26:34 -05:00
Fox-McCloud
3ce2c790e8 Adds Additional Plant Sprites 2015-11-08 07:58:37 -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
cc6dcd72bb Merge pull request #2468 from tigercat2000/tg-life 
-tg- Life() refactors
 2015-11-07 23:08:01 -05:00
Fox-McCloud
2335c6be9d Merge remote-tracking branch 'upstream/master' into barber-update 2015-11-06 06:30:59 -05:00
TheDZD
d504f33752 Merge pull request #2469 from Fox-McCloud/smoking 
Adds Random Cigs
 2015-11-06 06:15:01 -05:00
Fox-McCloud
1c8df180f8 Merge remote-tracking branch 'upstream/master' into barber-update 2015-11-05 19:42:41 -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
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
TheDZD
0604c8d16e Merge pull request #2325 from Aurorablade/ForTheSwarm2 
Fethas Carnival of Horrors part 1.5: Swarmers
 2015-11-03 19:20:08 -05:00
Tastyfish
91c31ceda7 fixed typos and inconsistencies in sign descriptions. 2015-11-02 00:30:06 -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
TheDZD
f94cb9c6dd Merge pull request #2405 from Fox-McCloud/multiverse-sword 
Multiverse sword
 2015-10-23 20:48:53 -04:00
cmbradsh
51e2384d97 item/examine() wasn't returning its value, thus all items seemed to be infinitely far away when using the return value from ..() in subclasses. 2015-10-22 00:05:19 -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
Aurorablade
1404c88229 fixes 
will still need to look at using transfer_to and the language key
 2015-10-19 08:27:06 -04:00
Aurorablade
3a2590261b Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into ForTheSwarm2 2015-10-18 21:37:28 -04:00
TheDZD
d681cefa03 Merge pull request #2362 from Fox-McCloud/gc-everything 
Garbage Collect Everything
 2015-10-18 16:44:35 -04: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
Aurorablade
d141945b10 Changed based on feedback 2015-10-13 23:01:28 -04: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
e60edf9345 Garbage Collect Everything 2015-10-13 20:23:26 -04:00
Fox-McCloud
6db6dcd3f1 flag 2015-10-13 19:14:25 -04:00