Fox-McCloud
|
3662431862
|
Fixes Wood Amounts
|
2015-11-21 22:57:23 -05:00 |
|
TheDZD
|
740e5304fd
|
Merge pull request #2613 from ZomgPonies/nations2
Nations 2.1
|
2015-11-21 22:20:39 -05:00 |
|
Fox McCloud
|
be192d6037
|
Merge pull request #2624 from Tastyfish/atmos_radios
Gave LSS's engineering channel on SB radios, fixed turbine exhaust pump
|
2015-11-21 21:27:24 -05:00 |
|
TheDZD
|
13efd8eeae
|
Merge pull request #2611 from Fox-McCloud/porta-seeder
Re-Adds Portaseeder
|
2015-11-21 21:27:12 -05:00 |
|
Tastyfish
|
83f8ba9b72
|
Gave atmos techs access to :e on station bounced radios
|
2015-11-21 16:04:19 -05:00 |
|
ZomgPonies
|
66202ff4b6
|
Bugfixes
|
2015-11-21 10:46:16 -05:00 |
|
Tigercat2000
|
d2ea2ae2e1
|
Fix pAI interface (somewhat)
|
2015-11-20 21:23:31 -08:00 |
|
TheDZD
|
0e33b7b65e
|
Merge pull request #2610 from Fox-McCloud/bags-and-qol
Chemistry and Bio-Bags and Xenobio QoL
|
2015-11-20 20:45:15 -05:00 |
|
TheDZD
|
c338c094fa
|
Merge pull request #2602 from Fox-McCloud/sofas-and-barber-chairs
Adds in Ability to Makes Sofas and Barber Chairs
|
2015-11-20 19:46:53 -05:00 |
|
ZomgPonies
|
bd0dd2ab4b
|
Added Peacekeeper borgs, removing thermals, giving them blue eyes, etc
|
2015-11-20 19:21:39 -05:00 |
|
ZomgPonies
|
589239f3cd
|
Make combat borg shield only need inv to be active
|
2015-11-20 19:04:49 -05:00 |
|
ZomgPonies
|
b8b7075780
|
Typo
|
2015-11-20 18:38:06 -05:00 |
|
ZomgPonies
|
d3db1a7fe9
|
Combat borg shields block flashes when active
|
2015-11-20 18:36:04 -05:00 |
|
Fox-McCloud
|
3e4059728f
|
Re-Adds Portaseeder
|
2015-11-20 00:26:51 -05:00 |
|
Fox-McCloud
|
edf2bfc4fc
|
Chemistry and Bio-Bags and Xenobio QoL
|
2015-11-19 20:38:07 -05:00 |
|
Fox McCloud
|
f52cc886b8
|
Merge pull request #2565 from ZomgPonies/nations
Nations 2.0
|
2015-11-19 19:33:21 -05:00 |
|
ZomgPonies
|
6c907de639
|
Cleaning up following DZD's recommendations
|
2015-11-19 15:24:06 -05:00 |
|
Fox-McCloud
|
c2fc9da61b
|
Adds in Ability to Makes Sofas and Barber Chairs
|
2015-11-19 01:29:32 -05:00 |
|
Fox McCloud
|
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 |
|
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 |
|
Robertha89
|
5c50d20d67
|
Fixes field surgical kits
|
2015-11-16 08:51:43 +01:00 |
|
Aurorablade
|
bc7a0864d5
|
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into TooSpoopy
|
2015-11-16 01:15:41 -05:00 |
|
TheDZD
|
64533c3c56
|
Merge pull request #2535 from Fox-McCloud/snacks
Snacks
|
2015-11-14 18:25:05 -05: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Aurorablade
|
600d351950
|
added in gib subtype
|
2015-11-02 20:54:34 -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 |
|