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
19,739 Commits 73 Branches 18 Tags
dd9691bb54c6bbaa9240de06c5e51cde7b88f8a3
Commit Graph

14791 Commits

Author SHA1 Message Date
Rob Nelson
dd9691bb54 Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into melting 
Conflicts:
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/stacks/sheets/mineral.dm
	code/setup.dm
 2014-11-02 12:47:21 -08:00
Rob Nelson
ae134e245c Define melting points. 2014-11-02 12:17:29 -08:00
d3athrow
25761ec23b Merge pull request #1823 from ComicIronic/FabIndex 
Fixed an issue with list indexes in fabricators.dm
 2014-11-02 10:46:40 -06:00
d3athrow
2ddbaf2004 Merge pull request #1777 from dylanstrategie/Surgery 
Re-introduce sex change surgery
 2014-11-02 08:20:36 -06:00
d3athrow
86dc7dbda7 Merge pull request #1824 from eswordthecat/Bleeding-Edge 
Integrating tg changes to inventory.
 2014-11-02 08:20:16 -06:00
d3athrow
f4a3904e54 Merge pull request #1827 from Erthilo/Bleeding-Edge 
Ryetalyn stops jittering.
 2014-11-02 08:19:56 -06:00
d3athrow
4d1ab4caa9 Merge pull request #1737 from ComicIronic/GygaxJail 
Added Mounted Gygax Cell #2: Electric Boogaloo
 2014-11-02 08:19:43 -06:00
ComicIronic
de55436c9f Commented out an unnecessary log line. 2014-11-02 11:03:02 +00:00
eswordthecat
4c6cd4e681 Comment out for now. 2014-11-02 02:34:36 -08:00
eswordthecat
c4cfb96eb8 Removed an unnecessary update_icons(), github.com/tgstation/-tg-station/commit/e3bb626ce949ca51372c3702a4b484b9fe036767. 2014-11-02 02:25:31 -08:00
eswordthecat
0e10144666 Merge remote-tracking branch 'upstream/Bleeding-Edge' into Bleeding-Edge 2014-11-02 02:15:28 -08:00
eswordthecat
4286fcf0b0 Added a put_in_hand_check. See, github.com/tgstation/-tg-station/pull/3568. 2014-11-02 02:04:44 -08:00
Rob Nelson
89ba2d7062 Objects now melt() into slag if their melt_temperature is set. 2014-11-02 01:48:49 -07:00
Rob Nelson
fa3c1b0b6f Coins, ores, slag now recyclable. 2014-11-02 00:16:03 -07:00
Erthilo
e250c69e75 Ryetalyn stops jittering. 2014-11-02 02:12:20 +00:00
d3athrow
d89e4114fc Merge pull request #1826 from DeityLink/cherry 
the Bucket o' Blood update (feat. cherries)
 2014-11-01 16:43:26 -05:00
d3athrow
7f30f2dc5c Merge pull request #1825 from dylanstrategie/Meteor 
Messing around with Meteor values
 2014-11-01 16:42:46 -05:00
dylanstrategie
ce7b031928 No explication needed 2014-11-01 21:19:46 +01:00
DeityLink
ecf082951c adding visible_message for when the bucket's content spills 2014-11-01 21:10:12 +01:00
DeityLink
58c3895a41 wearable buckets and cherries. splashing blood on people 2014-11-01 20:56:20 +01:00
dylanstrategie
f2f6f05e83 More values 2014-11-01 20:34:48 +01:00
dylanstrategie
3a499d31d8 Fucking around with Meteor values 
- Meteors now last one hour from shuttle call. Still shorter than your
average round if antag taxi doesn't happen too easy
- Meteor density has been reduced a little bit in an attempt to reduce
the lag
- Removing a var that was being set every tick to try and de-clutter
everything

Massive optimizations will likely be needed to make Meteors less
lag-apocalyptic, but this should set everything on the right way
 2014-11-01 20:25:38 +01:00
ComicIronic
c36f080072 Fix merge conflicts. 2014-11-01 18:42:17 +00:00
ComicIronic
e1d8d79cc1 Use length instead of lentext, adjusted a value by 1. 2014-11-01 18:40:03 +00:00
ComicIronic
00e37c3016 Fixed an issue with list indexes in fabricators.dm 2014-11-01 18:20:23 +00:00
d3athrow
f0d0e546fa Merge pull request #1821 from eswordthecat/patch-7 
Optimized and refactored list2text, text2list, and replacetext.
 2014-11-01 13:13:10 -05:00
eswordthecat
c97c6f0dba Optimized and refactored list2text, text2list, and replacetext. 2014-11-01 23:14:41 -08:00
DeityLink
c168c4bdff more slime changes 2014-11-01 15:40:48 +01:00
dylanstrategie
a0bb01c912 Apply fixes requested by Wild Bill 2014-11-01 14:48:47 +01:00
d3athrow
f7f1a82281 Merge pull request #1765 from eswordthecat/patch-4 
Copy admin only log system of NSS-Phoenix.
 2014-10-31 23:53:46 -05:00
d3athrow
f9f8781c7d Merge pull request #1764 from eswordthecat/patch-1 
Use s_html library by Spuzzum
 2014-10-31 23:53:29 -05:00
d3athrow
ecae75b5b4 Merge pull request #1792 from eswordthecat/patch-6 
Makes point into a mob verb(https://github.com/tgstation/-tg-station/pul...
 2014-10-31 23:52:57 -05:00
d3athrow
b40574f8e2 Merge pull request #1808 from Menshin/Bleeding-Edge 
Maploader rewriting, /vg edition
 2014-10-31 23:52:51 -05:00
d3athrow
086b3e8d41 Merge pull request #1809 from N3X15/prison-fix 
Prison Command no longer strips
 2014-10-31 23:52:44 -05:00
d3athrow
4951876b63 Merge pull request #1813 from DeityLink/photofix-1 
added /obj/machinery/light exception to Get Flat Icon
 2014-10-31 23:52:26 -05:00
d3athrow
98d80af4f3 Merge pull request #1814 from ComicIronic/DamageFix 
Fixed bullets not embedding.
 2014-10-31 23:52:11 -05:00
d3athrow
27adb1c335 Merge pull request #1816 from N3X15/fix-wallmerge 
Wallsmoothing 2.0 fixes.
 2014-10-31 18:25:59 -05:00
Rob Nelson
0ee1fe47c0 Wallsmoothing 2.0 fixes. 2014-10-31 16:22:01 -07:00
dylanstrategie
b6c6421390 Break lists and include absolute pathing 2014-11-01 00:16:08 +01:00
d3athrow
9038da6df1 Merge pull request #1815 from dylanstrategie/SCP-Fix 
Fixes to SCP-173 behavior
 2014-10-31 18:07:00 -05:00
dylanstrategie
3acf1eca35 Fixes to SCP-173 behavior 
I have decided to release the fixes outside of other SCP-related plans
for Halloween. Maybe more adminbuse will occur this way

- SCP nows stuns and paralyses as soon as he gets a grab, and not after
a huge list of fluff. This ensures you can't lag-walk your way out of
his grab forever. At least it should
- Attempt fix to SCP's sight code. Now he should ALWAYS count himself as
observed if someone is facing him, instead of weighting odds like a
drunkard and ignoring non-direct sight 90 % of the time
- Save up one indent level by returning Life() code after sight check if
we have observed
- Fix error caused by trying to get a vent's name, and foolproof it in
general. No need to know SCP went through the Bar Air Vent 2

This should do for now. If any more bugs show up, warn me
 2014-10-31 23:57:41 +01:00
ComicIronic
abf976d91a Edited proc arguments. 2014-10-31 21:33:36 +00:00
DeityLink
fea478020d added /obj/machinery/light exception to Get Flat Icon 2014-10-31 21:45:25 +01:00
Chris
f8ea52d9fc Fix travis 2014-10-31 12:12:52 -05:00
Chris
8a3e9b2428 Merge remote-tracking branch 'origin/Bleeding-Edge' into bay_hydro_port 
Conflicts:
	code/modules/projectiles/guns/energy/special.dm
	maps/tgstation.dmm
 2014-10-31 12:02:10 -05:00
Chris
10ecc2585d Fixes from bay upstream for hydro rewrite 2014-10-31 11:41:26 -05:00
Chris
2eb8ebcec6 Fix #1682 2014-10-31 11:03:59 -05:00
Chris
bcf27e2cd5 fix master belt maybe? 2014-10-31 11:01:39 -05:00
DeityLink
9c5bc94ebb food/slime/monkey processor improvement 2014-10-31 14:56:02 +01:00
Rob Nelson
f1dad37103 PP > Prison no longer strips prisoners, making it viable for investigatin'. 2014-10-30 19:25:04 -07:00