cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,758 Commits 73 Branches 18 Tags
a09552f34bcd1417509303513e679128778e14fc
Commit Graph

11283 Commits

Author SHA1 Message Date
Rob Nelson
a09552f34b Revert "New Nuke Icons, new Medical HUD sprites" 2015-10-06 21:25:02 -07:00
Rob Nelson
192d54f0fb Merge pull request #6006 from PJB3005/anchoring-hacks 
Anchors the AI eye.
 2015-10-06 20:44:42 -07:00
Rob Nelson
6924c3cdfb Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into Bleeding-Edge 2015-10-06 20:20:50 -07:00
Rob Nelson
8be01d82c5 Hopefully fix buggy vox num2words shit for good. 2015-10-06 20:20:29 -07:00
dylanstrategie
910dd58fa0 Update CrowbarDestroy and Destroy for all medical scanners 2015-10-07 02:40:11 +02:00
PJB3005
72a9b17ba5 Anchors the AI eye. 2015-10-07 01:52:51 +02:00
Rob Nelson
a5f8d47946 Merge pull request #5954 from clusterfack/optimizingshitagain 
Optimizes update_action_buttons
 2015-10-06 13:04:14 -07:00
Rob Nelson
42f9277e60 Merge pull request #5999 from DeityLink/mercha 
Small fix to Merch Computer transactions
 2015-10-06 12:57:04 -07:00
DeityLink
9b9751848c fix 2015-10-06 21:39:02 +02:00
clusterfack
0f30cb13f5 Fixes pooling bug 
Also tests and debugs the new system
 2015-10-06 14:28:40 -05:00
Rob Nelson
a4f9c7c32c Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into Bleeding-Edge 2015-10-06 11:38:27 -07:00
Rob Nelson
9e7d4ecdb5 Borer eggs will check for conditions again after failing to recruit. 2015-10-06 11:38:05 -07:00
clusterfack
59c35f4f6d Runtime 2015-10-06 12:34:55 -05:00
clusterfack
833217ecba Fix/Improve hud elements\\ 
Fixes #5994
Fixes #5995
 2015-10-06 09:39:09 -05:00
Rob Nelson
4200b09464 Merge pull request #5992 from DeityLink/cin 
[Bugfix] Finally fixed plant growth overlays
 2015-10-05 22:59:11 -07:00
Rob Nelson
ee1cdbc396 Explot fix for borer reproduction. Fixes #5991 2015-10-05 22:55:36 -07:00
DeityLink
969c939dee fixing growth overlays 2015-10-06 07:40:13 +02:00
Rob Nelson
d939881714 Merge pull request #5974 from dylanstrategie/Meteors 
Update Meteors gamemode
 2015-10-05 18:53:29 -07:00
dylanstrategie
bd313413e3 Update Meteors gamemode 2015-10-05 08:54:30 +02:00
Rob Nelson
624845d2fe Merge pull request #5866 from unid15/maus_port 
Allows picking up all tiny animals
 2015-10-04 23:52:35 -07:00
Rob Nelson
0461eacb00 Merge pull request #5950 from Shadowmech88/Lawgiver2 
Lawgiver
 2015-10-04 23:52:03 -07:00
Rob Nelson
b24d319cdd Possibly fix #5958 2015-10-04 18:51:09 -07:00
unid15
807d1fa8b6 adds missing qdels 2015-10-04 20:55:59 +02:00
unid15
a22a3e5983 more cooking machine improvements 2015-10-04 20:44:46 +02:00
unid15
a611de7a25 allows picking up tiny animals 
better_code

changelog

changelog, tweaks

last changes

makes cooking machiens work better

fuck

more friendly code

fix for custom food names

small animals can't escape automatically
 2015-10-04 20:29:54 +02:00
Shadowmech88
99c1a78f4c Added the lawgiver. 
Slightly increased the chance for light explosion damage to destroy girders.
 2015-10-04 04:35:02 -05:00
Rob Nelson
d023d2cfb9 Merge pull request #5732 from DeityLink/paintings 
[Content] Merch Computer revamp and Paintings
 2015-10-04 00:30:23 -07:00
DeityLink
65874499db Merch Computer Revamp and Paintings 2015-10-04 09:27:40 +02:00
Rob Nelson
283336cf62 Merge pull request #5816 from Faptastic/Bleeding-Edge 
Spliced virus samples now get their own entry in the database after ejection.
 2015-10-04 00:11:52 -07:00
Rob Nelson
ae5c831252 Merge pull request #5931 from Repth1/Bleeding-Edge 
New Nuke Icons, new Medical HUD sprites
 2015-10-04 00:10:07 -07:00
clusterfack
50a22a3b4e Merge pull request #5947 from DeityLink/ethereal 
Ethereal fixes
 2015-10-04 02:03:59 -05:00
DeityLink
42e2c8b4ab RAAAAARRRGGHHH 2015-10-04 08:51:50 +02:00
DeityLink
087530a815 ethereal fixes and changelog 5947 2015-10-04 08:47:01 +02:00
Rob Nelson
681bfb7127 Fix borers dying to plasma gas. I am dumb. 2015-10-03 23:11:34 -07:00
clusterfack
e7f232fde0 Merge pull request #5944 from DeityLink/shadow 
Fixes #4314
 2015-10-04 00:25:38 -05:00
DeityLink
ea95ed29c5 changelog 5944 also fixes #4314 2015-10-04 07:21:34 +02:00
Rob Nelson
5623ff2ed4 Fixes #5902 2015-10-03 20:35:28 -07:00
Rob Nelson
e5bdf502d1 Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into borer-fixes 
# Conflicts:
#	maps/tgstation.dmm
 2015-10-03 20:13:00 -07:00
Rob Nelson
b7e6f58f5f Merge pull request #5933 from dylanstrategie/Handicap 
Unfuck external organs, hopefully
 2015-10-03 19:00:57 -07:00
Rob Nelson
d05f7b5b4c Plasma setup for box, fixed egg hatching 
Fixes #5937
 2015-10-03 18:56:27 -07:00
Rob Nelson
213c0902fd Reshuffle unlockable chems (#5937 item 3) 2015-10-03 15:44:57 -07:00
Rob Nelson
b7aecaa6d6 Borer fixes (#5937 1&2) - Unlocks are part of borers rather than a global list. (TODO) 2015-10-03 14:52:51 -07:00
dylanstrategie
dda34ea123 Span fix 2015-10-03 20:02:46 +02:00
Rob Nelson
de657d1afb Merge pull request #5936 from unid15/master 
Fixes bugs and beartraps
 2015-10-03 10:46:04 -07:00
unid15
b2035a7b45 beartrap fixes 2015-10-03 19:41:47 +02:00
unid15
72e2c06c13 part 2 2015-10-03 14:55:13 +02:00
Rob Nelson
8bf0bd3750 Testing complete. 2015-10-02 18:39:20 -07:00
Rob Nelson
e9b6df2fd1 Add some more verbs for borers. 
Fixes #5927
 2015-10-02 18:02:22 -07:00
dylanstrategie
742d348507 And now it works, fucking scream 2015-10-03 02:03:43 +02:00
Rob Nelson
0221032332 Borers can now lay eggs (100 chems). Also fixes recruiting. 2015-10-02 16:33:10 -07:00