Spacemanspark
39737e6c05
Adds big cardboard boxes.
...
!
2015-12-20 15:31:24 -06:00
Aurorablade
6bde6078e2
don't code half awake
...
also added some hud making stuff to the make antag procs. it might fix
an issue fox reported..more sleep now
2015-12-20 07:16:35 -05:00
ZomgPonies
3acff9ccff
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into russian
2015-12-20 06:29:28 -05:00
FalseIncarnate
97f7a0d7e8
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
2015-12-20 02:57:01 -05:00
Aurorablade
d75549fdd6
no more changling cyborgs
...
also added in some procs for as furture need...god i need sleep now.
2015-12-20 01:47:15 -05:00
TheDZD
ff32b32eb9
Merge pull request #2894 from Fox-McCloud/wormhole-projector
...
Ports Wormhole Projector
2015-12-20 00:34:44 -05:00
Fox McCloud
88ca79a37b
Merge pull request #2902 from TheDZD/putting-this-cryo-bug-on-ice
...
Fixes Cryopods Being Overly Attached to Crew
2015-12-19 22:58:41 -05:00
Aurorablade
80eb828563
this shit dosen't even compile yet...
2015-12-19 22:39:47 -05:00
TheDZD
f7937b5df1
This is why we can't have ice things
2015-12-19 22:17:30 -05:00
TheDZD
8436047fe9
Fixes Shuttle Transit Z-Levels
...
Fixes z level fuckery with jumping off of shuttles in transit.
Fixes #2518
2015-12-19 20:26:33 -05:00
Fox-McCloud
ea11eaa387
Ports Wormhole Projector
2015-12-19 00:57:40 -05:00
FalseIncarnate
62e238b9a6
Mech Syringe Gun In-Hand Sprite
...
Supposedly this was a bug? Maybe, but now the mech syringe gun shows up
as a syringe gun in your hand. Can't be used like one, for hopefully
obvious reasons, but I guess you can use it to scare people?
2015-12-19 00:07:55 -05:00
Fox McCloud
4c03cf2599
Merge pull request #2797 from Aurorablade/HudRefactor
...
[Ready for Review][WTF]Hud refactor
2015-12-18 21:13:21 -05:00
Crazylemon64
2fc7a199a8
While I'm at it, give medical more starting antibiotics
2015-12-18 08:10:10 -08:00
Regen
a244b36952
Adds jump to the admin message
2015-12-18 16:24:49 +01:00
Regen
5c891fab41
Makes code look neat-er
...
Probably smoother as well, idk, I did what tiger asked me
2015-12-18 16:08:37 +01:00
FalseIncarnate
a744ffdc3c
Assorted Sprite-Related Fixes
...
Candy canes no longer have transparent stripes
- Fixes #2876
- Moved candy.dmi into the icons/obj/food/ folder
- Removed the candy sprites from the food.dmi file
Replaced reagentchocolatebar with cocoa_pile
- This is what is made when you spill chocolate reagent on the floor,
and is not the same as the chocolate bars you use for making stuff
- Should avoid confusion and also fixes a potential infinite-generation
exploit of chocolate and sugar
- Fixes #2614
Flamethrower in-hand icons now display properly
- Fixes #2856
- Will always show a tank in the in-hand, regardless of if a tank is
attached
Smartfridges will now remain visible when you open their panels with a
screwdriver
- Fixes #2847
Hand-rolled cigarettes now show on sprite when equipped as a mask
- Fixes #2427
Apple seeds now have a proper seed packet
- Fixes #1409
- Will make the xenobotany machines mentioned in the issue buildable in
a separate PR, as that is beyond scope / feature-request
2015-12-18 08:45:30 -05:00
Fox McCloud
b91e95120f
Merge pull request #2869 from KasparoVy/master
...
Adds Vulpkanin Species Flag
2015-12-18 04:57:24 -05:00
Aurorablade
3ae8118b9c
please let me have map merged right....
2015-12-18 03:09:25 -05:00
TheDZD
f12675b248
Merge pull request #2866 from Fox-McCloud/rapid-construction
...
Ports Rapid Construction for Part Replacer
2015-12-17 23:35:26 -05:00
Aurorablade
ccd6d2641b
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HudRefactor
2015-12-17 22:43:09 -05:00
Crazylemon
1805269393
First pass of R&D consoles not losing special ID stuff when de/reconstructed
...
The RD's ID, and anyone with equivalent access, can switch the access
restrictions on an RD console's board in event of the boards getting
destroyed
2015-12-17 18:51:06 -08:00
Tigercat2000
12911463e7
Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT
...
Conflicts:
code/game/gamemodes/objective.dm
2015-12-17 18:46:50 -08:00
TheDZD
8e9cfff75a
Merge pull request #2864 from Fox-McCloud/medigun
...
Ports TG Beam Code and Medigun
2015-12-17 21:19:13 -05:00
TheDZD
95092816d1
Merge pull request #2868 from Fox-McCloud/hijack-fix
...
Fixes Hijack Objective
2015-12-17 21:12:56 -05:00
TheDZD
4a1f712722
Merge pull request #2859 from Fox-McCloud/meteor
...
Adjusts Meteor Required Players
2015-12-17 21:12:50 -05:00
Fox-McCloud
3db762597c
actual fix
2015-12-17 20:00:29 -05:00
Tigercat2000
b085bf8bab
Shuttle README, Wrap up dev tools.
2015-12-17 16:49:19 -08:00
Tigercat2000
91a9ab4683
Nuke the rest of bay shuttles. Fuck you, Bay shuttles.
2015-12-17 15:18:10 -08:00
Tigercat2000
7474cbcf48
Shuttles: Admin, Ferry, ERT + Science Fix
2015-12-17 14:21:42 -08:00
KasparoVy
f4b3afff5b
Tajara back to Tajaran
2015-12-17 16:57:12 -05:00
Tigercat2000
527475f886
Shuttles: NukeOps, Fixes
2015-12-17 11:41:55 -08:00
Tigercat2000
e014f4a1b6
Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT
2015-12-17 07:26:41 -08:00
Crazylemon
0162d9f86b
Added sanity checks to cloner autoprocess, scanning, and growing
2015-12-17 05:38:18 -08:00
KasparoVy
4453239421
Adds Vulpkanin Species Flag
...
Adds the Vulpkanin species flag to the cargo vendor, and fixes a couple
typos in the item descriptions.
2015-12-17 04:29:17 -05:00
Regen
b26491617f
Adds confirmation alert, changes some values
2015-12-17 10:14:03 +01:00
Fox-McCloud
a9ad488b7a
Fixes Hijack Objective
2015-12-17 02:31:07 -05:00
Aurorablade
52e43c4d2d
good news everyone! It works!
2015-12-17 01:29:21 -05:00
Fox-McCloud
c83a36aa21
Ports Rapid Construction for Part Replacer
2015-12-16 23:42:39 -05:00
TheDZD
2f1932a923
Merge pull request #2855 from Fox-McCloud/medbot-skins
...
Medbot Skins and Cutomizable Healing
2015-12-16 21:23:33 -05:00
Fox-McCloud
a9a0a49986
Ports TG Beam Code and Medigun
2015-12-16 21:05:10 -05:00
TheDZD
5a086fdda7
Merge pull request #2845 from Fox-McCloud/mining-tweak
...
Guardian Mining Tweak
2015-12-16 20:10:23 -05:00
Fox-McCloud
39a63ec613
Adjusts Meteor Required Players
2015-12-16 06:52:57 -05:00
Fox-McCloud
74923ec323
oops
2015-12-16 00:18:53 -05:00
Fox-McCloud
80e2676e0c
medbot fixes and tweaks and features
2015-12-16 00:02:18 -05:00
Aurorablade
6eac1092bb
hate the mask of narnar
2015-12-15 22:27:30 -05:00
Fox-McCloud
7a766067ee
typo
2015-12-15 22:11:00 -05:00
Tigercat2000
e82eff800c
Shuttles: Research + Mining fixes
2015-12-15 18:19:34 -08:00
Fox-McCloud
6105699160
More Medbot Skins
2015-12-15 20:02:29 -05:00
Regen
ad5256b788
Fixes and more text
2015-12-15 22:55:27 +01:00
