Fox McCloud
d07bce4a66
Merge pull request #2515 from Spacemanspark/master
...
Adds in toy chainsaws.
2015-11-18 14:04:17 -05:00
Spacemanspark
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
Aurorablade
bc7a0864d5
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into TooSpoopy
2015-11-16 01:15:41 -05:00
TheDZD
dc24c9b99d
Merge pull request #2552 from tigercat2000/ugh_really
...
WHEELCHAIRS ARE NOT SPORTS BIKES
2015-11-15 11:59:28 -05:00
Fox McCloud
0b5875992b
Merge pull request #2538 from Crazylemon64/miner_announce
...
Additional Requests Console Functionality
2015-11-15 08:17:20 -05:00
Tigercat2000
89b1472929
whoops not that slow
2015-11-14 21:17:53 -08:00
Tigercat2000
0a7225e8eb
wheelchair speeds
2015-11-14 21:09:23 -08:00
TheDZD
64533c3c56
Merge pull request #2535 from Fox-McCloud/snacks
...
Snacks
2015-11-14 18:25:05 -05:00
Crazylemon64
1b4a39eb24
MULEbots notify on relevant deliveries
...
Also:
-Adds more request consoles throughout the map
- Atmospherics, Brig Medbay, Warden, Security
2015-11-14 14:29:24 -08:00
Fox-McCloud
c08959423c
Snacks
2015-11-13 17:16:47 -05:00
Tigercat2000
1023727689
Fix UI issues, fix weird modkit list
2015-11-11 17:55:36 -08:00
Tigercat2000
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
TheDZD
b72280c2e2
Merge pull request #2512 from Fox-McCloud/pneumatic-cannon
...
Ports TG Pneumatic Cannon
2015-11-11 09:52:16 -05:00
Spacemanspark
2365949a69
FIXFIXFIXFIXFIXAHHHHHHHHHHH
2015-11-10 19:19:29 -06:00
Spacemanspark
20822be0cb
Makes code smaller.
2015-11-10 19:15:45 -06:00
Spacemanspark
51d874fb8f
D'OH.
2015-11-10 19:11:36 -06:00
Spacemanspark
8a9908e6db
Makes toy chainsaws into their own base.
2015-11-10 19:05:18 -06:00
Spacemanspark
8192127aec
Removes the istype() statement from chainsaws.
2015-11-10 19:04:53 -06:00
TheDZD
0e94e359f1
Merge pull request #2506 from Fox-McCloud/kitchen-changes
...
Kitchen Updates
2015-11-10 19:35:29 -05:00
Spacemanspark
38072c2372
Removes the now nonexistant variable from toy chainsaws.
2015-11-10 16:20:48 -06:00
Spacemanspark
2e1e0ee3ea
Use an istype statement rather than a new variable.
2015-11-10 16:20:05 -06:00
Spacemanspark
c688479e61
Toy chainsaw!
2015-11-10 15:53:39 -06:00
Spacemanspark
f552ab1b7f
Prevents toy chainsaws from stunning people when used.
2015-11-10 15:51:47 -06:00
Fox-McCloud
bfac0b62fa
Ports TG Pneumatic Cannon
2015-11-09 22:54:05 -05:00
TheDZD
0aee56a1e7
Merge pull request #2501 from Fox-McCloud/plants
...
Adds Additional Plant Sprites
2015-11-09 20:16:00 -05:00
TheDZD
5d0677f714
Merge pull request #2500 from Fox-McCloud/fish-kit
...
Aquarium Starter Kit
2015-11-09 20:15:55 -05:00
Tastyfish
c9852cb34f
Made it check for recursive buckling again too
2015-11-09 02:29:18 -05:00
Fox-McCloud
ab3ed53734
Kitchen Updates
2015-11-09 01:09:59 -05:00
Tastyfish
c91657477e
Fixed buckling to check for someone already buckling correctly, and to tell subclasses that buckling was successful correctly
2015-11-09 00:26:34 -05:00
Fox-McCloud
3ce2c790e8
Adds Additional Plant Sprites
2015-11-08 07:58:37 -05:00
Fox-McCloud
318c464f94
Aquarium Starter Kit
2015-11-08 07:38:09 -05:00
Tigercat2000
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
Fox McCloud
cc6dcd72bb
Merge pull request #2468 from tigercat2000/tg-life
...
-tg- Life() refactors
2015-11-07 23:08:01 -05:00
Aurorablade
51abacac93
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into TooSpoopy
2015-11-06 12:08:51 -05:00
Fox-McCloud
2335c6be9d
Merge remote-tracking branch 'upstream/master' into barber-update
2015-11-06 06:30:59 -05:00
TheDZD
d504f33752
Merge pull request #2469 from Fox-McCloud/smoking
...
Adds Random Cigs
2015-11-06 06:15:01 -05:00
Fox-McCloud
1c8df180f8
Merge remote-tracking branch 'upstream/master' into barber-update
2015-11-05 19:42:41 -05:00
Fox-McCloud
17112cda3d
barber update 2.0
2015-11-05 06:51:00 -05:00
Fox-McCloud
40a5abbb4a
Barber Update
2015-11-05 02:04:46 -05:00
Fox-McCloud
4687620436
Adds Random Cigs
2015-11-04 22:47:18 -05:00
Tigercat2000
67e20ff5d5
-tg- Life() refactors
...
This commit does a *lot*
Main points of shit changed:
- Breathing for carbons is now partially handled at a carbon/Life()
level; Humans still use their species bullshit and all.
- Most shit has been pushed up the chain to living/Life().
- Simple_animals no longer use the fucking stupid Die() proc, they use
death() like a consistant fucker.
- Human vision is now handled via species.
- Lots and lots of robot copypasta cleaned
- AI is still a terrifying mess, not even -tg- touches it
I have tested this, and everything I thought to test worked:
- Aliens breathing
- Humans breathing
- Human vision
- Robot HUD
- human HUD
- Simple animals automatic systems
- Simple animals dying properly
- Robot goggles working
2015-11-04 16:32:57 -08:00
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
Aurorablade
f5f7c0cde9
might not be doing this right but eh
2015-11-02 21:58:15 -05:00
Aurorablade
600d351950
added in gib subtype
2015-11-02 20:54:34 -05:00
Tastyfish
91c31ceda7
fixed typos and inconsistencies in sign descriptions.
2015-11-02 00:30:06 -05:00
Aurorablade
f9d96ffbf1
WIP commit
...
still working on the camera thing..
2015-11-01 01:19:35 -04:00
Tigercat2000
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
Aurorablade
570cfbe566
Spoopy
2015-10-29 12:32:38 -04: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
