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
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
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
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
Aurorablade
2b54e5cf63
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into ForTheSwarm2
2015-10-11 22:50:27 -04:00
Fox-McCloud
9795dc761b
Removes Nations and Unused Game Modes
2015-10-11 19:51:19 -04: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
8134abf488
Merge pull request #2339 from tigercat2000/pullfactor
...
-tg- pull refactor
2015-10-11 15:46:36 -04:00
TheDZD
c2ffc31963
Merge pull request #2335 from Fox-McCloud/fix-dem-destroys
...
Last Few Destroy Fixes
2015-10-10 18:45:59 -04:00
Fox McCloud
13638cc6a6
Merge pull request #2330 from Robertha89/master
...
Science Goggle Analysers
2015-10-10 18:23:36 -04:00
Tigercat2000
ccdae149bb
-tg- pull refactor
...
This commit does the following:
- Overhauls how pull works. It is now based on a mob verb,
mob/verb/pulled()
- Makes the pull icon much more responsive. It is now updated whenever a
mob starts or stops pulling an object, and instantly updates.
- This required HUD changes. God help me.
2015-10-10 11:15:52 -07: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
Robertha89
acb55613d4
Better way of calling material and tech name
2015-10-10 12:11:19 +02:00
Fox-McCloud
ec10abc480
Last Few Destroy Fixes
2015-10-10 00:16:31 -04:00
Robertha89
acb9ae2c4b
Shows proper tech name
2015-10-10 01:38:59 +02:00
TheDZD
07770fdda7
Merge pull request #2321 from Fox-McCloud/another-del-pass
...
Another del->qdel pass
2015-10-09 18:05:00 -04:00
Fox-McCloud
a96375a54e
more del to qdel
2015-10-09 17:14:49 -04:00
Robertha89
836ddb15d4
Science analyser goggles
2015-10-09 08:22:45 +02:00
Aurorablade
769a5d3bff
FUUUUUUUUUUUUUUUUUUUUUUUUUUUU
...
Merge conflict EXTREAME FIX
2015-10-08 18:38:45 -04:00
Fox-McCloud
e17c6bde22
Another del->qdel pass
2015-10-08 16:49:10 -04:00
Fox-McCloud
5c512793b9
Removes the Rest of Pooled Objects
2015-10-08 14:18:40 -04: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
6d978232d5
Merge remote-tracking branch 'upstream/master' into stupid-triggers
2015-10-06 18:25:26 -04:00
