cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-05 15:11:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,141 Commits 26 Branches 2 Tags
0834bfb865a30b49a6f57764a2ddfe89ecb3cb4a
Commit Graph

18719 Commits

Author SHA1 Message Date
Fox-McCloud
0834bfb865 more robust logging 2015-11-03 07:16:14 -05:00
Fox-McCloud
bff03521b1 Wire Investigation 2015-11-03 06:35:51 -05:00
TheDZD
736baf3890 Merge pull request #2414 from Robertha89/patch-1 
Can pick up mobs in closets
 2015-11-01 12:36:07 -05:00
Fox McCloud
7a1cfbeac3 Merge pull request #2441 from TheDZD/teleport 
Bluespace crystal and tomato fix
 2015-10-31 21:26:47 -04:00
TheDZD
67f2662fb4 Merge pull request #2432 from Tastyfish/master 
Fixed how things get space cash worth, and richest escapee scoreboard line
 2015-10-31 16:12:05 -04:00
DZD
316113b52e BS crystal and tomato fix 
No Z2 exploits for you.
 2015-10-31 10:20:17 -04:00
TheDZD
52b9678e34 Merge pull request #2426 from tigercat2000/thankstg 
Adds the ability to access game preferences while not in lobby
 2015-10-29 22:23:33 -04:00
TheDZD
3d3e0f0ccc Merge pull request #2422 from tigercat2000/so_messy 
Clean up mob code a bit
 2015-10-29 22:22:57 -04:00
Tastyfish
042ba8959e Merge branch 'master' of https://github.com/Tastyfish/Paradise 2015-10-28 19:04:54 -04:00
Tastyfish
d0a16cb489 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-10-28 19:02:27 -04:00
Tastyfish
fe42a3fd4b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-10-28 18:49:58 -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
Mark van Alphen
f76109ca5c Merge pull request #2420 from Crazylemon64/monkey_multiplication 
Monkey Multiplication
 2015-10-28 02:44:28 +01:00
Mark van Alphen
98889499bc Merge pull request #2415 from tigercat2000/HOW_THE_FUCK_DO_YOU_KEEP_BREAKING_THIS 
Fix Spacepod bullshit.
 2015-10-28 02:44:18 +01:00
Mark van Alphen
a9c424ca7c Merge pull request #2419 from Crazylemon64/sleeper_ui 
Sleeper NanoUI
 2015-10-28 02:43:39 +01:00
MrStonedOne
88bb132f22 Adds the ability to access game preferences while not in lobby 
Also removed a few preferences_toggles verbs that are no longer needed.

Haven't tested this too much yet, but from what I can tell, no ill effects of doing this have been observed.
 2015-10-27 08:53:38 -07:00
Tigercat2000
0061844a77 No humans, you do not need to update action buttons twice 2015-10-27 06:19:25 -07:00
Tigercat2000
206f7079df Clean up mob code a bit 
Does the following:
 - Cleans up how gravity works, a little bit
 - Pushes duplicated procs for slimes/xenos/humans up to carbon/Life()
 - carbon/Life() is now a thing, it handles the non-special stuff for all
   carbons
 - Mob controller no longer ticks a seperate entity, mob_master is now
   just a reference to the mob process, which ticks.
 2015-10-27 06:19:24 -07:00
Crazylemon
7d0f7d6363 The other half of my monkey recycler fix 
Forgot to fix this, the first time through!
 2015-10-25 22:13:13 -07:00
Crazylemon
f822d37f63 I like spans! I hate old crusty unused functions that use text()! 2015-10-25 20:54:47 -07:00
Crazylemon64
a2669d6791 Sleeper now has a temperature and pulse readout 2015-10-25 14:09:03 -07:00
Tigercat2000
5c06f724ce my ability to care is waning 2015-10-25 13:44:06 -07:00
Fox McCloud
2aed207eb4 Merge pull request #2410 from Crazylemon64/conscious_scream 
Dead humans are now no longer able to emote
 2015-10-25 16:33:40 -04:00
Crazylemon64
9e0e68a8b6 Sleepers now use NanoUI 
Also cuts out a few points of weirdness; No dialysis on bloodless races
like IPCs, and dialysis on simple_animals is no longer possible through
the interface or through href twiddling, as that caused a runtime.

Also, prevents href tweaking to dispense chemicals the sleeper doesn't
have.
 2015-10-25 10:35:39 -07:00
Tigercat2000
3381874471 Decrease Vulgarity, fix mistake 2015-10-24 15:35:11 -07:00
Tigercat2000
f98d2d066c Hopefully fix Spacepod bullshit. 
I cleaned up part of my giant mess, and tried to ensure that the
references will never be incorrect, however THAT PROBABLY WON'T FUCKING
WORK, so I also added a proc spacepods call every time they want to
interface with the occupant vars, which checks that the occupants are
actually valid, and nulls them/moves them as appropriate.
If this happens, it will make a debug log message and yell about it.
 2015-10-24 10:20:22 -07:00
Robertha89
eb134e92d9 Can pick up mobs in closets 2015-10-24 18:21:35 +02:00
Fox McCloud
185439855e Merge pull request #2408 from Crazylemon64/hydrotray_fix 
Makes upgraded hydroponic trays actually do something
 2015-10-24 03:32:34 -04:00
TheDZD
f94cb9c6dd Merge pull request #2405 from Fox-McCloud/multiverse-sword 
Multiverse sword
 2015-10-23 20:48:53 -04:00
Crazylemon
24bc5aadde First test of the sleeper UI. This will probably summon 50 demons 2015-10-23 15:22:56 -07:00
Crazylemon
95e574d4d5 Moves around the deathgasp emote in the human death proc 
This should prevent the death check from stopping our dying gasp
 2015-10-23 15:16:58 -07:00
Crazylemon
aa1186ae2d Dead humans are now no longer able to emote 2015-10-23 14:57:18 -07:00
Crazylemon
c093a64429 Makes upgraded hydroponic trays actually do something 2015-10-23 12:45:20 -07:00
Fox-McCloud
c4341992d1 last tweaks 2015-10-22 21:52:20 -04:00
Fox-McCloud
2e8e5c3a37 friendly-fire-proofing 2015-10-22 02:48:46 -04:00
Fox-McCloud
cc9861ecad duplication tweaks 2015-10-22 02:11:36 -04:00
Fox-McCloud
77a354979c tweaks 2015-10-22 01:13:37 -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
Fox McCloud
e78b952bff Merge pull request #2396 from KasparoVy/master 
Adds More Vox Hair (Head+Facial)
 2015-10-21 03:57:19 -04:00
Fox McCloud
b1f0fc9326 Merge pull request #2399 from bfilia/master 
Fixed pipe dispenser
 2015-10-20 17:39:48 -04:00
Fox McCloud
4dc589d400 Merge pull request #2393 from tigercat2000/bodyscanner_nano 
NanoUI Bodyscanner
 2015-10-20 17:39:28 -04:00
BF
db97a45373 Fixed pipe dispenser 
Pipe dispenser was outputting dual-port air vent in place of digital valve.
 2015-10-20 16:15:22 -04:00
KasparoVy
931d053b1d Adds More Vox Hair (Head+Facial) 
A straight-up port from VG. Saw that someone on Bay went for it and this
was the first I've seen of VG's different Vox hairstyles so I figured
I'd make a pull here too.

I know some of these look weird, so if there's any that you absolutely
don't want in, just specify them and I'll axe it.
 2015-10-19 20:02:21 -04:00
Tigercat2000
c36e35a421 CF BodyTemp 2015-10-19 16:10:11 -07:00
TheDZD
7908591af3 Merge pull request #2386 from Fox-McCloud/reagents-seeing 
Reagent Scanner/Seeing
 2015-10-19 18:53:45 -04:00
TheDZD
a19c391beb Merge pull request #2391 from Fox-McCloud/say-bubble-fix 
Say Bubble Refactor+Fix
 2015-10-19 18:52:07 -04:00
TheDZD
ccafe065af Merge pull request #2392 from Fox-McCloud/power-performance 
Lights and Static Power: Machine Processing Optimization
 2015-10-19 18:29:57 -04:00
Fox-McCloud
9558991873 Pipe Fixes 2015-10-19 17:50:47 -04:00
Fox-McCloud
6d2a2f3eba tweaks 2015-10-19 17:20:35 -04:00