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
Robertha89
663f8b87e3
fixes 2458
2015-11-03 22:35:00 +01:00
Aurorablade
07999f0792
don't code half awake
2015-11-03 15:25:01 -05:00
TheDZD
3a6c60abb6
Merge pull request #2456 from Fox-McCloud/cable-grief
...
Wire Investigation
2015-11-03 08:32:34 -05:00
Aurorablade
05f9c085a6
another change
2015-11-03 08:26:32 -05:00
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
Fox McCloud
5c8b285b22
Merge pull request #2450 from tigercat2000/FUCKING_GOD_THIS_SHIT_ANNOYS_THE_FUCK_OUT_OF_ME
...
Add config option to disable same-CID popup "YOU'LL BE BANNED STOP IT"
2015-11-03 00:00:27 -05:00
TheDZD
b3405001cc
Merge pull request #2433 from tigercat2000/telecOOOOMS
...
Telecomms Refactor & CodeMirror
2015-11-02 19:03:27 -05:00
Tigercat2000
aa86c85b98
Add config option to disable same-CID popup "YOU'LL BE BANNED STOP IT"
...
This is seriously fucking annoying when testing local changes. Only a
config option instead of being removed completely because I am actually
going to go fucking insane without this being gone.
2015-11-01 20:34:37 -08:00
Aurorablade
c767da2de9
Reviewed TG Simple animal file
...
made changes.
2015-11-01 07:01:12 -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
Tigercat2000
dbe125f192
Implement PJ's suggestions and fixes, plus syntax highlighting
2015-10-29 11:02:33 -07:00
Tigercat2000
c244a0fe15
Telecomms Refactor & CodeMirror
...
This commit does the following:
- A lot of shit I am really too tired to fucking write about
- Absolute pathed telecomms scripting
- Browser Datum traffic control
- Absolutely lovely replacement for the fucking skin TCS window, using
codemirror
- CodeMirror integration for nanoUI
- Sorta, I didn't work on this as much as I wanted to, because IT TOOK
11 FUCKING HOURS TO GET THE BROWSER DATUM TO WORK
2015-10-28 17:23:22 -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
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
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
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
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
77a354979c
tweaks
2015-10-22 01:13:37 -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
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
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
Fox-McCloud
6d2a2f3eba
tweaks
2015-10-19 17:20:35 -04: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
Fox-McCloud
8774ec1f66
Lights and Static Power: Machine Processing Optimization
2015-10-18 21:06:25 -04:00
Fox-McCloud
597108dc40
Say Bubble Refactor+Fix
2015-10-18 18:58:21 -04:00
TheDZD
dfd070fe44
Merge pull request #2378 from Fox-McCloud/clean-up
...
Code Cleanup
2015-10-18 16:44:53 -04:00
TheDZD
d681cefa03
Merge pull request #2362 from Fox-McCloud/gc-everything
...
Garbage Collect Everything
2015-10-18 16:44:35 -04:00
TheDZD
f8af90b9f8
Merge pull request #2385 from Fox-McCloud/egg-runtime
...
Fixes Egg Runtime
2015-10-18 16:42:50 -04:00
Fox-McCloud
aabdfc3924
Reagent Scanner/Seeing
2015-10-18 00:44:15 -04:00
Fox-McCloud
06975138d1
Fixes Egg Runtime
2015-10-18 00:01:11 -04:00
Fox-McCloud
f08062f566
Reduces Round-start Atmos Processing: Full Charge Disposals
2015-10-17 19:53:21 -04:00
Fox-McCloud
8c67b24506
Code Cleanup
2015-10-17 05:58:37 -04:00
