Commit Graph

2793 Commits

Author SHA1 Message Date
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
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
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
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
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
Tigercat2000
8c97846746 -tg- style inventory update, stripping update
This commit does the following:
 - Updates a few of our inventory procs to -tg-'s latest
 - Nukes the equip_e system from orbit
 - Fancy UI for stripping people now
 - Nuked fucking kitten ears from their snowflakey bullshit update_icons
   shitty fuck fuck FUCK
 - NUKED FUCKING METAL DETECTORS AHHHHHHHHHHHHHHHHHHHHHHHHHH
2015-10-04 16:53:48 -07:00
Markolie
b24f5ff979 Fixes and pinpointer update 2015-10-05 00:26:43 +02:00
TheDZD
8181354ffc Merge pull request #2261 from Markolie/fixesfixesfixesfixesfixesfixes
Fixes
2015-10-02 15:50:23 -04:00
TheDZD
de8e5ecfd0 Merge pull request #2254 from Markolie/swordnborg
Syndicate borg update, add medical syndicate borg, energy sword refactor
2015-10-02 15:49:57 -04:00
Markolie
e27f84df7d Dead people can emote! 2015-10-02 03:59:03 +02:00
Markolie
f6903f0152 Alien specific 2 2015-10-01 04:33:58 +02:00
Markolie
bb0bbdcf5a Alien claws fix 2015-10-01 04:27:59 +02:00
Markolie
d18b18b5b4 Syndicate borg update, add medical syndicate borg, energy sword refactor 2015-10-01 04:21:24 +02:00
Tigercat2000
d0af69afd5 Spanssss 2015-09-30 13:45:54 -07:00
Tigercat2000
c4fa813331 Remove remaining arbitrary restrictions on has_fine_manip
This commit removes all (most) of the remaining code limiting xenomorphs
that have has_fine_manipulation on an entirely arbitrary basis. Xenomorphs
with has_fine_manipulation may now interact with NanoUI, and will only
break computers on non-help intent. The can also tear down walls, since
walls used an ishuman check in place of an isAdvancedToolUser check as
they should have.

Minor refactor to machinery.dm as well; Instead of the slightly
(completely) insane attack_hand restriction to humans and silicons (it was
a multi-line IF, why), it now checks user.IsAdvancedToolUser(); This means
restrictions on monkies will actually function properly now.
2015-09-30 10:50:10 -07:00
Fox McCloud
15c9873cdf Merge pull request #2224 from Markolie/shitcode
Strange reagent fix, tod --> timeofdeath
2015-09-29 18:25:04 -04:00
Markolie
8b2e62fc10 Strange reagent fix, tod --> timeofdeath 2015-09-29 22:03:04 +02:00
Crazylemon
734e0842e2 Fixed a few more reversed add_logs
Did a search, and found 3 of these to patch up. Perhaps there's
something left, perhaps not.
2015-09-29 11:56:51 -07:00
Mark van Alphen
25f19dff0d Merge pull request #2204 from Fox-McCloud/belt-of-holding
Ports NT Station's Belt of Holding Sprite
2015-09-29 18:47:17 +02:00
Fox-McCloud
7586390436 Merge pull request #2146 from TheDZD/vision
Shadowling, Changeling, and Vision Fixes/Changes
2015-09-29 11:44:06 -04:00
TheDZD
6705006ee7 Merge pull request #2213 from Fox-McCloud/destroy-fixes
Fixes a few Destroys
2015-09-28 19:28:29 -04:00
TheDZD
19d8aa3d36 Merge pull request #2215 from Markolie/s2
Fix flamethrower logs
2015-09-28 19:03:45 -04:00