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
20,161 Commits 73 Branches 18 Tags
2b88b0ad49c3a8530160e2a755728cb15d502dd5
Commit Graph

20161 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DeityLink
2b88b0ad49 Adminbus fixing final part: goodbye Isolated 2014-11-27 13:41:30 +01:00
DeityLink
393d5b29f8 motherfucker.dme 2014-11-27 06:56:19 +01:00
DeityLink
446186c41a ackkk 2014-11-27 06:53:26 +01:00
DeityLink
cbfd4ec08a solving conflict 2014-11-27 06:47:56 +01:00
d3athrow
56ba91f35f Merge pull request #1986 from VelardAmakar/supersingulo 
Various Supersingulo tweaks and fixes.
 2014-11-26 22:21:01 -06:00
VelardAmakar
a6967d8312 Various Supersingulo tweaks and fixes. 
Prevents S-Singulo from being blown up, acquiring supermatter properties as a result of gaining loads of power, turning into a Size 9 Singularity due to power loss, and cleans up a few bits that were overlooked, like color macros.
 2014-11-26 22:36:40 -05:00
d3athrow
7c6c11938f Merge pull request #1930 from dylanstrategie/Rad-Collectors 
Make Radiation Collectors harder to upkeep and less productive
 2014-11-26 16:15:01 -06:00
Chris
b97676bfc7 fix being able to eat people from afar 2014-11-26 14:34:51 -06:00
Chris
4e32544c98 another messed up cable 2014-11-26 14:07:31 -06:00
Chris
4c46b8f63b Fix cabling issue in atmos 2014-11-26 13:57:35 -06:00
Chris
9b3bf4361a Added pda painter to hop's office, added defibs and chargers to the station. 
changelog
 2014-11-26 13:52:27 -06:00
Chris
a15a954308 Bep bop, map vote pops up if it happens. 2014-11-26 11:17:50 -06:00
Chris
fe29414ac5 delay world reboot a bit 2014-11-26 09:39:42 -06:00
d3athrow
6384ca744b Merge pull request #1977 from Heredth/Bleeding-Edge 
Add two new scores to final score message
 2014-11-25 18:05:30 -06:00
d3athrow
aef43135a5 Merge pull request #1947 from Duny-/Grafix_stuff 
Adjusting color of the new warning stripes
 2014-11-25 18:03:34 -06:00
Chris
f38b0b5e69 Remind security borgs to not be shit 2014-11-25 17:50:24 -06:00
Heredth
fcf425c66c This triggered me 2014-11-25 13:35:54 -08:00
DeityLink
8911b1bf1b Adminbus fixing part 8 2014-11-25 07:03:28 +01:00
DeityLink
1c30164583 ack 2014-11-25 06:50:27 +01:00
DeityLink
3188ffa05d oh who am I kidding 2014-11-25 06:48:55 +01:00
DeityLink
8ec66ff016 fix 2014-11-25 06:03:42 +01:00
DeityLink
8011f03fa3 Adminbus fixing part 7 2014-11-25 06:01:30 +01:00
DeityLink
6e07c4e1c8 aaaahgoddamnit 2014-11-25 04:54:20 +01:00
DeityLink
636236f6cf Adminbus fixing part 6 2014-11-25 04:52:44 +01:00
DeityLink
b33f168c3d Added in-hand fuse bomb sprite 2014-11-25 04:23:08 +01:00
DeityLink
ff329a29ee Merge remote-tracking branch 'origin/Bleeding-Edge' into adminbus-final 2014-11-25 04:03:35 +01:00
DeityLink
d72e117772 re-adding infinite laser gun sprite 2014-11-25 04:02:11 +01:00
DeityLink
175d04e8f5 Adminbus fixing part 5 2014-11-25 03:58:56 +01:00
DeityLink
730b0825b8 duh 2014-11-24 17:40:19 +01:00
DeityLink
200528a310 Adminbus fixing part 4 2014-11-24 17:03:41 +01:00
Chris
7f6d10848e Fix maptools 2014-11-23 15:17:05 -06:00
Chris
efaebfe1db fug 2014-11-23 12:11:38 -06:00
Chris
2797fa88f6 Fix travis. 2014-11-23 12:08:19 -06:00
Chris
7e8026d4f0 Make project mind check human and psy block status. merged the check into a new proc called can_mind_interact(mob) 2014-11-23 12:06:09 -06:00
Chris
b1ea75814c Changelog update. 2014-11-23 11:55:00 -06:00
Chris
fb194e52e4 For some reason we were looping through the entire world to find runes in many situations. Added a global list for runes that are added to on creation, and removed upon destruction. 2014-11-23 11:54:35 -06:00
DeityLink
f5d825fec2 Adminbus fixing part 3 2014-11-23 18:31:22 +01:00
d3athrow
25f5a8ada5 Merge pull request #1962 from Duny-/defficiency 
Renaming efficiency to defficiency and metastation to metaclub
 2014-11-23 11:23:51 -06:00
Duny-
eadbd723bd Renaming efficiency to defficiency and metastation to metaclub 
100% my idea, and you can't stop it from happening
 2014-11-23 18:05:26 +01:00
d3athrow
700658c8ab Merge pull request #1961 from eswordthecat/patch-8 
Probably fix #1509.
 2014-11-23 10:57:57 -06:00
eswordthecat
d214513c61 baby we have proc for this. 2014-11-24 00:41:54 -08:00
eswordthecat
aaeb48ac55 Probably fix #1509. 2014-11-24 00:36:53 -08:00
eswordthecat
c7e51a0adb system_integrity from bay. 2014-11-23 19:08:36 -08:00
DeityLink
db901f9336 fixing more conflicts 2014-11-23 17:37:50 +01:00
DeityLink
76b66de477 Adminbus fixing part 2 2014-11-23 17:31:50 +01:00
d3athrow
2198dcbb91 Merge pull request #1950 from VelardAmakar/Bleeding-Edge 
Super Gravitational Singularity
 2014-11-23 10:17:37 -06:00
d3athrow
2765942b9e Merge pull request #1949 from N3X15/patch-1 
Purty Supermatter Lighting
 2014-11-23 10:17:23 -06:00
d3athrow
d4f073dcf3 Merge pull request #1958 from eswordthecat/patch-9 
system_integrity from bay.
 2014-11-23 10:14:53 -06:00
d3athrow
7d0b037529 Merge pull request #1959 from Unfit/Bleeding-Edge 
Vox and pirate shuttle areas moved north
 2014-11-23 10:10:39 -06:00
DeityLink
8134f72199 WHO TOUCHED GUN.DMI? 2014-11-23 16:27:54 +01:00