Fox-McCloud
7c739e4745
Merge pull request #710 from ZomgPonies/limb
...
Port of the BS12 limb overhaul
2015-04-05 19:06:39 -04:00
ZomgPonies
ca7c6f9db7
Merge pull request #734 from tigercat2000/SuicideActs
...
Adds the most important suicide_act (Toy Katana)
2015-04-05 19:03:35 -04:00
ZomgPonies
2684a2b999
Merge pull request #733 from tigercat2000/StahpSpawningSpessworm
...
Prevent life reagent from spawning spaceworms
2015-04-05 19:02:55 -04:00
ZomgPonies
430e08574b
Merge pull request #729 from SamCroswell/PosterUpdate
...
Poster update
2015-04-05 19:02:46 -04:00
ZomgPonies
3e5ccfd99e
Merge pull request #728 from TheDZD/minor-fixes
...
Mute Changes
2015-04-05 19:02:34 -04:00
ZomgPonies
e733d1caf0
Merge pull request #730 from Fox-McCloud/tweaks-and-tweaks
...
[Goonchem] More Additions and Tweaks
2015-04-05 19:02:18 -04:00
ZomgPonies
9dfe308b3d
Derp
2015-04-05 18:53:10 -04:00
ZomgPonies
1719df1be2
Fox balancing
2015-04-05 18:51:09 -04:00
Fox-McCloud
fb03e1bc88
updates
2015-04-05 17:54:48 -04:00
Tigercat2000
fcf6f268ee
I can type, I swaer!
2015-04-05 23:44:22 +02:00
Tigercat2000
d9613e7a25
Adds the most important suicide_act
...
Lolzy suicide_act for the replica katana, as requested by nomzy-xilia
2015-04-05 22:12:47 +02:00
Tigercat2000
1bc73bd054
Prevent life reagent from spawning spaceworms
...
Spaceworms are specifically designed as an adminbooze mob- they are NOT
currently balanced to be spawned by any reactions or such. They even can
qdel things that they eat.
2015-04-05 21:06:44 +02:00
ZomgPonies
cafbb8035c
microfix
2015-04-05 14:47:51 -04:00
Fox-McCloud
f977b62724
few more tweaks
2015-04-05 05:24:14 -04:00
Fox-McCloud
afb8626670
[Goonchem] More Additions and Tweaks
2015-04-05 03:18:18 -04:00
ZomgPonies
91cb7b8b32
Final fixes
2015-04-04 23:30:49 -04:00
SamCroswell
8485ae4bab
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into PosterUpdate
2015-04-04 23:05:18 -04:00
SamCroswell
57703695ed
Poster Rework Part 3
2015-04-04 23:04:45 -04:00
VelardAmakar
4dc73ce9af
Added ~15~ 12 new hair options courtesy of Fury McFlurry
2015-04-05 04:20:26 +02:00
ZomgPonies
c23f2019fe
Merge pull request #725 from Fox-McCloud/brain-damage
...
Lethal Brain Damage
2015-04-04 22:07:39 -04:00
DZD
1fa2c164f9
Mute Changes
...
- R_MOD is now needed to mute players.
- Admins/mods/mentors can now be muted. The first two can unmute
themselves, the third cannot.
- Global OOC mute now applies to mentors as well, but not to admins or mods.
- Global Deadchat mute still only applies to regular players.
- Mods using DSAY will show up as MOD instead of MENTOR.
2015-04-04 20:05:42 -04:00
ZomgPonies
91e8b909c0
Squish Squash
2015-04-04 14:27:53 -04:00
ZomgPonies
1628202202
Merge pull request #724 from tigercat2000/ProcessorCleanup
...
Cleanup food processor code
2015-04-04 14:06:46 -04:00
ZomgPonies
e4816d2571
Merge pull request #721 from tigercat2000/PicketPort
...
Adds Picket Signs (Port from -tg-)
2015-04-04 14:04:59 -04:00
ZomgPonies
98be74aeb6
Merge pull request #723 from Fox-McCloud/science-rebalance
...
Science Department Restructuring---Xenobotany
2015-04-04 14:04:47 -04:00
Fox-McCloud
ddba1a418a
[Goonchem] Tweaks
2015-04-04 07:46:00 -04:00
Fox-McCloud
1a81836556
Lethal Brain Damage
2015-04-04 01:51:04 -04:00
Tigercat2000
84827bd58c
Cleanup Food* processor code
...
Because 'process scheduler' is a waaay different system
2015-04-04 04:47:42 +02:00
Fox-McCloud
d7d2dfc3c3
Science Department Restructuring---Xenobotany
2015-04-03 20:18:08 -04:00
AnturK
2dea395f32
- Adds Picket Signs
2015-04-04 00:07:20 +02:00
SamCroswell
98fd743f6d
Adds Poster Supply Packs
2015-04-03 17:15:07 -04:00
SamCroswell
c6f5f1f8cd
Poster Update
2015-04-03 16:45:44 -04:00
Fox-McCloud
ff5ec1df54
meh
2015-04-03 05:32:53 -04:00
Fox-McCloud
0efdc07191
[Goonchem] Few Recipes Tweaks
2015-04-03 01:25:42 -04:00
ZomgPonies
d4a658ba48
Merge pull request #715 from Fox-McCloud/few-reagents
...
[Goonchem] Few New Reagents
2015-04-02 21:32:28 -04:00
Fox-McCloud
5bb830771d
fix-ups
2015-04-02 19:54:01 -04:00
ZomgPonies
c3a2916d85
Merge pull request #711 from tigercat2000/Spesswormoverhaul
...
Spaceworm overhaul (-tg-port)
2015-04-02 14:07:41 -04:00
Fox-McCloud
3bcbd2488c
[Goonchem] Few New Reagents
2015-04-02 05:04:20 -04:00
ZomgPonies
6ad9603d1b
Merge pull request #713 from FalseIncarnate/master
...
Custom Items - Diemos Vezzati
2015-04-01 23:09:12 -04:00
Tigercat2000
e05ff3335f
add factions
2015-04-02 03:28:41 +02:00
Fox-McCloud
cd5649e522
Fixes Dead People Vomitting
2015-04-01 19:29:06 -04:00
FalseIncarnate
85d805b2ba
Fixes item path
...
Now properly denotes the blue mask as a fluff item in it's path.
2015-04-01 03:58:52 -04:00
FalseIncarnate
c7d7df0700
Custom Items - Diemos Vezzati
...
Adds in their custom jumpsuit, armor vest, and sec mask.
2015-04-01 03:44:26 -04:00
Fox-McCloud
89ba815dcc
Peridaxon fix
2015-03-31 22:38:13 -04:00
Fox-McCloud
eaa54f046b
Merge remote-tracking branch 'upstream/master' into reagent-touch-rework
2015-03-31 22:31:59 -04:00
ZomgPonies
8890d6cbea
Merge pull request #706 from Fox-McCloud/Dropper
...
[Goonchem] Pipettes, Fixes, and Tweaks (again)
2015-03-31 22:24:01 -04:00
Fox-McCloud
5d89a61c1b
[Goonchem] Reagent TOUCH Rework
2015-03-31 21:43:09 -04:00
Tigercat2000
f837edf180
Spaceworm overhaul
2015-04-01 03:13:48 +02:00
Orange Borg
25334a31cc
Avoid infinite loop in getFlatIcon
...
Since I did it on tg anyway
2015-04-01 11:43:47 +13:00
Fox-McCloud
78fccb1e82
fix
2015-03-31 16:57:43 -04:00
