f52cc886b8
Merge pull request #2565 from ZomgPonies/nations
...
Nations 2.0
2015-11-19 19:33:21 -05:00
6c907de639
Cleaning up following DZD's recommendations
2015-11-19 15:24:06 -05:00
8c1f11fb0b
Merge pull request #2566 from Robertha89/master
...
Fixes invisible wrapping paper, sonic jackhammer not breaking walls and field surgery kit not fitting its own content
2015-11-18 21:26:23 -05:00
d07bce4a66
Merge pull request #2515 from Spacemanspark/master
...
Adds in toy chainsaws.
2015-11-18 14:04:17 -05:00
eb28de5e42
Removes useless return statement from toy chainsaws
...
If this breaks something I'm going to remove Tigercat's soul.
2015-11-17 19:31:48 -06:00
5c50d20d67
Fixes field surgical kits
2015-11-16 08:51:43 +01:00
bc7a0864d5
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into TooSpoopy
2015-11-16 01:15:41 -05:00
64533c3c56
Merge pull request #2535 from Fox-McCloud/snacks
...
Snacks
2015-11-14 18:25:05 -05:00
c08959423c
Snacks
2015-11-13 17:16:47 -05:00
1023727689
Fix UI issues, fix weird modkit list
2015-11-11 17:55:36 -08:00
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
2365949a69
FIXFIXFIXFIXFIXAHHHHHHHHHHH
2015-11-10 19:19:29 -06:00
20822be0cb
Makes code smaller.
2015-11-10 19:15:45 -06:00
51d874fb8f
D'OH.
2015-11-10 19:11:36 -06:00
8a9908e6db
Makes toy chainsaws into their own base.
2015-11-10 19:05:18 -06:00
8192127aec
Removes the istype() statement from chainsaws.
2015-11-10 19:04:53 -06:00
38072c2372
Removes the now nonexistant variable from toy chainsaws.
2015-11-10 16:20:48 -06:00
2e1e0ee3ea
Use an istype statement rather than a new variable.
2015-11-10 16:20:05 -06:00
c688479e61
Toy chainsaw!
2015-11-10 15:53:39 -06:00
f552ab1b7f
Prevents toy chainsaws from stunning people when used.
2015-11-10 15:51:47 -06:00
bfac0b62fa
Ports TG Pneumatic Cannon
2015-11-09 22:54:05 -05:00
318c464f94
Aquarium Starter Kit
2015-11-08 07:38:09 -05:00
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
51abacac93
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into TooSpoopy
2015-11-06 12:08:51 -05:00
2335c6be9d
Merge remote-tracking branch 'upstream/master' into barber-update
2015-11-06 06:30:59 -05:00
17112cda3d
barber update 2.0
2015-11-05 06:51:00 -05:00
40a5abbb4a
Barber Update
2015-11-05 02:04:46 -05:00
4687620436
Adds Random Cigs
2015-11-04 22:47:18 -05:00
600d351950
added in gib subtype
2015-11-02 20:54:34 -05:00
f9d96ffbf1
WIP commit
...
still working on the camera thing..
2015-11-01 01:19:35 -04:00
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
570cfbe566
Spoopy
2015-10-29 12:32:38 -04:00
d0a16cb489
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
2015-10-28 19:02:27 -04:00
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
a404929d16
Multiverse Sword
2015-10-21 23:59:59 -04:00
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
33220548fc
Fixes a Lipstick Runtime
2015-10-18 03:40:21 -04:00
b7e4dab0e3
Merge pull request #2369 from tigercat2000/hmm_fancy
...
Radio NanoUI improvements
2015-10-16 17:19:22 -04:00
d6cb0f9075
Merge pull request #2365 from Crazylemon64/apc_autolathe
...
APC electronics refactor
2015-10-15 16:03:08 -04:00
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
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
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
dd97cc261d
Merge pull request #2343 from Fox-McCloud/game-mode-cleanup
...
Removes Nations and Unused Gamemodes
2015-10-13 21:34:49 -04:00
6db6dcd3f1
flag
2015-10-13 19:14:25 -04:00
9398a3a92c
Retro Toggle, more color tweaks
2015-10-12 13:38:22 -07:00
cbe21922ef
Merge pull request #2346 from Fox-McCloud/suspicious-dereferencing
...
More Dereferencing
2015-10-12 16:36:14 -04:00
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
46f9f68f31
more de-referencing
2015-10-12 04:18:49 -04:00
81cfcd7af3
More Dereferencing
2015-10-12 02:37:52 -04:00
9795dc761b
Removes Nations and Unused Game Modes
2015-10-11 19:51:19 -04:00
Fox McCloud