58b0497569
Merge pull request #887 from Fox-McCloud/shirtfix
...
Fixes Shirts+Underwear---Adds Dressers
2015-04-26 10:08:36 -04:00
100789f6ec
Merge pull request #877 from Fox-McCloud/beakerbomb
...
[Goonchem] Beaker Bombs
2015-04-26 10:07:46 -04:00
0342e4306c
Merge pull request #870 from veganzombeh/digitalcamera
...
Adds digital camera to the protolathe construction menu.
2015-04-26 10:07:31 -04:00
cf1ac2f602
Fixes #881 and lets vampires gain nutrition from consuming blood reagent.
...
Fixes #881 , vampires should no longer get fat from drinking too much blood. Handle_blood now checks for blood that isn't their own and "eats" it.
2015-04-26 11:33:05 +01:00
85ca01350f
Adds a ditigal camera to the protolathe construction menu.
...
The digital camera allows you to save up to 10 photos, and print or delete them whever you want. It still requires film to print photos.
2015-04-26 10:07:08 +01:00
fc05bea682
Fixes Shirts+Underwear---Adds Dresses
2015-04-25 23:44:19 -04:00
fb579b0d19
assembly fixes
2015-04-25 22:43:40 -04:00
43e6e900fb
Merge pull request #882 from CrAzYPiLoT-SS13/master
...
Language fix + Corgi health status fix
2015-04-25 17:50:05 -04:00
2ea39812e7
Merge pull request #847 from TheDZD/420yolotest
...
Removes Changeling Bloodtest
2015-04-25 17:48:53 -04:00
013e7cfcdd
Merge pull request #874 from Fox-McCloud/chem-messages
...
[Goonchem] No Mix Messages
2015-04-25 17:45:31 -04:00
d0702db369
Refactor pony code
...
This refactors the simple_animal/pony code to use absolute paths and be
less shitty in general
2015-04-25 13:58:07 -07:00
a59f797752
Addition
...
What it says on the tin.
2015-04-25 22:46:12 +02:00
86ef9115dd
Merge pull request #880 from Fox-McCloud/asteroid-fix
...
Asteroid Temp Fix
2015-04-25 15:53:02 -04:00
bbe0c08fe8
Language fix
...
Fixes https://github.com/ParadiseSS13/Paradise/issues/845
This now works. Simple as that.
2015-04-25 21:45:53 +02:00
b5fe239c24
Asteroid Temp Fix
2015-04-25 15:36:21 -04:00
71b4e9e719
Merge pull request #871 from Fox-McCloud/goregib
...
More Gore from Gibbing
2015-04-25 15:28:49 -04:00
3f1726fbb8
Merge pull request #867 from Fox-McCloud/smoke
...
[Goonchem] Smoke Tweaks
2015-04-25 15:28:40 -04:00
9b205e5be9
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into shadowling
2015-04-25 13:46:41 -04:00
ccfde28c4e
First commit of context-based grab from Bay12
...
This is the first commit to the context based grab system ported from
baystation 12. It includes the first 4 baystation commits. More commits
will be added as their system is developed.
2015-04-25 10:37:01 -07:00
735bfdf012
Fixes cmd_ghost_drag perms
...
This fixes the cmd_ghost_drag perms to work as they were originally
intended to- requiring either varedit OR r_admin + r_debug. The original
checks were exclusive, as it checked for no r_varedit OR no r_admin +
r_debug, which means that unless the user had all three, it would always
fail.
2015-04-25 08:08:58 -07:00
c226067277
[Goonchem] Beaker Bombs
2015-04-25 05:28:56 -04:00
f5ace231e1
Fixes invisible carbon/human
...
High priority, needs to be merged and patched ASAP.
Need one of the other maintainers to check to see if this won't be
particularly process-intensive for the server.
2015-04-24 19:02:44 -04:00
bd16e0fbaa
[Goonchem] No Mix Messages
2015-04-24 16:21:33 -04:00
02f749a32b
Merge pull request #863 from ZomgPonies/unban
...
Admin unban panel overhaul
2015-04-24 14:59:39 -04:00
ae86274de8
Merge pull request #866 from Fox-McCloud/grabfix
...
Grab Fix
2015-04-24 14:59:12 -04:00
d570c0df31
Merge pull request #862 from tigercat2000/mbcidip
...
Bay play_server_sound caching & admin 'who' showing account age
2015-04-24 14:57:12 -04:00
4e8ec07743
Merge pull request #861 from TheDZD/aooc
...
Adds Antagonist OOC
2015-04-24 14:56:53 -04:00
32e868621f
More Gore from Gibbing
2015-04-24 08:01:07 -04:00
9a99f8758f
[Goonchem] Smoke Tweaks
2015-04-24 00:17:03 -04:00
3439a034d8
Grab Fix
2015-04-23 22:16:44 -04:00
55060280f0
Admin unban panel overhaul
2015-04-23 14:02:51 -04:00
34863374a0
First part of Bay admin improvements
...
This commit integrates baystation12's play_server_sound system, admin
'Who' showing account age.
2015-04-23 10:01:45 -07:00
d0620af858
Adds AOOC
...
via Baystation12/Baystation12#8411
2015-04-23 12:41:06 -04:00
e916de60a1
Ports tgstation/-tg-station#8927 .
...
And fixes a few other things.
2015-04-23 12:25:18 -04:00
773f093f2b
Spider Balance--Venom
2015-04-22 18:36:38 -04:00
dd27b54f15
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into shadowling
2015-04-22 11:51:18 -04:00
b0eebfaada
Shadowling species fixes
2015-04-22 11:50:50 -04:00
2d93888ea0
Vampires get nutrition from blood, not food.
...
Sucking blood increases nutrition, nutriment reagent does not. Also adds an immunity check for holy water contact.
2015-04-22 10:19:16 +01:00
099d638c15
Merge pull request #851 from ZomgPonies/shadow
...
Slime people fixes
2015-04-21 20:02:33 -04:00
1cc53ab186
Yeah and this too.
2015-04-21 20:00:19 -04:00
5e68ee4bd8
Forgot this jeeze!
2015-04-21 19:55:32 -04:00
8de0140dcc
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into shadowling
...
Conflicts:
code/modules/mob/living/carbon/human/human.dm
code/setup.dm
2015-04-21 18:56:34 -04:00
e8038738f6
Merge pull request #800 from ZomgPonies/shadow
...
Mutantrace update
2015-04-21 18:36:24 -04:00
8ce0212850
Final fixes
2015-04-21 18:05:43 -04:00
180f61f5fb
Merge pull request #830 from Fox-McCloud/hitblips
...
Removes Hitblips
2015-04-21 17:33:32 -04:00
bc9a6fe09e
Merge pull request #839 from tigercat2000/MassDriveVG
...
Code rework of placing things on walls.
2015-04-21 17:31:45 -04:00
5a51494ca6
Merge pull request #850 from Fox-McCloud/tators
...
Traitor Item Additions and Surplus Crates
2015-04-21 17:31:34 -04:00
f1fe01cf80
Merge pull request #841 from tigercat2000/Muttercicle
...
Three new vehicles from Urist and vehicle folder tree restructuring.
2015-04-21 17:31:03 -04:00
7e73701687
Merge pull request #844 from tigercat2000/Ventrcrawl
...
Ventcrawl Overhaul
2015-04-21 17:30:15 -04:00
1adc73a45c
Merge pull request #838 from Fox-McCloud/donkpockets
...
Donk Pocket Fix
2015-04-21 08:06:54 -04:00
ZomgPonies