Fox-McCloud
dec621eefd
Revert "R&D Research Levels Unification"
2015-04-07 01:16:19 -04:00
ZomgPonies
4e9daf6aa8
Merge pull request #746 from jack-fractal/write-research-debug
...
R&D Research Levels Unification
2015-04-06 23:28:27 -04:00
jack-fractal
a0be969870
Unifying tech levels
...
Unifies tech levels between design and their products.
2015-04-06 22:07:44 -04:00
Tigercat2000
34d0bdc946
Fix exploit to get around delay, change to notice instead of warning
2015-04-07 02:26:25 +02:00
ZomgPonies
f767cfa460
Merge pull request #741 from SamCroswell/TDomeUpdate
...
Thunderdome Update
2015-04-06 18:16:30 -04:00
SamCroswell
69c788449b
Thunderdome - Create Teams Button
2015-04-06 11:59:02 -04:00
SamCroswell
e6a6803e24
Thunderdome - Reset Thunderdome Button
2015-04-06 11:22:21 -04:00
Tigercat2000
3681914d25
Thiiis is what I get for assuming obj/machinery is anchored by default
2015-04-06 13:52:42 +02:00
Fox-McCloud
9ca8def744
[Goonchem] Fixups
2015-04-05 21:56:59 -04:00
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
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
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
Fox-McCloud
afb8626670
[Goonchem] More Additions and Tweaks
2015-04-05 03:18:18 -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
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
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
Fox-McCloud
3bcbd2488c
[Goonchem] Few New Reagents
2015-04-02 05:04:20 -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
d87730d7b3
fixes
2015-03-31 03:23:45 -04:00
ZomgPonies
f7fb4f0376
Merge pull request #703 from Svej/ntrephat
...
Nanotrasen Representative hat
2015-03-30 13:54:26 -04:00
Svej
a0e1cd5683
Nanotrasen Representative hat
...
Adds a fancy hat to the NT Reps locker
2015-03-30 14:10:28 +02:00
ZomgPonies
7262eace42
Merge pull request #700 from Fox-McCloud/more-goontweaks
...
[Goonchem] Even More Tweaks and Fixes
2015-03-29 20:22:12 -04:00
ZomgPonies
48ad4e346b
Merge pull request #702 from SamCroswell/DeathCommandoFixes
...
DS Radio and Rapid Deployment Fixes
2015-03-29 20:22:03 -04:00
SamCroswell
63337efdb8
DS Radio and Rapid Deployment Fix
2015-03-29 19:25:32 -04:00
Fox-McCloud
ae9fc03548
Disables Perma-Spinning (for now)
2015-03-29 19:05:59 -04:00
Fox-McCloud
d44688f7b9
[Goonchem] Even More Tweaks and Fixes
2015-03-29 17:57:12 -04:00
ZomgPonies
7e1f7a0b22
Merge pull request #680 from tigercat2000/spiritboard
...
Spirit Boards! (from -tg-)
2015-03-29 01:02:59 -04:00
ZomgPonies
0b630c4ca7
Merge pull request #691 from jack-fractal/pda_logs
...
Adding extra logging information to PDA for refactor prep
2015-03-29 01:02:05 -04:00
ZomgPonies
46aaed0ca9
Merge pull request #694 from TheDZD/minor-fixes
...
Bugfixes and Custom Food Sanity
2015-03-28 23:24:17 -04:00
ZomgPonies
7dc292f472
Merge pull request #696 from Fox-McCloud/Goon-tweaks
...
[Goonchem] Tweaks, Fixes, etc.
2015-03-28 23:23:47 -04:00
ZomgPonies
40926b5c86
Merge pull request #697 from Fox-McCloud/Spinning
...
You Spin Me Right Round
2015-03-28 23:23:37 -04:00
Fox-McCloud
d4de91ce15
You Spin Me Right Round
2015-03-28 23:17:00 -04:00
Fox-McCloud
7dc856c86c
Merge pull request #686 from tigercat2000/CryoSpritey
...
Cryo will now show occupant inside on sprite. (Bayport)
2015-03-28 22:57:08 -04:00
