Commit Graph

12570 Commits

Author SHA1 Message Date
Rob Nelson
44a97a317c Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into Bleeding-Edge 2014-05-23 12:56:03 -07:00
Rob Nelson
ac9e1fb80f Fix jukebox restarting current song when a song is purchased. 2014-05-23 12:55:46 -07:00
Rob Nelson
3655494197 Merge pull request #786 from Aranclanos/magicmisslaggy
Magicmisslaggy
2014-05-23 12:28:16 -07:00
Rob Nelson
1c60a589e0 Merge pull request #785 from Rei1226/rei21
Fixed issues with pants sprites not showing up correctly
2014-05-23 12:28:09 -07:00
Rob Nelson
703bc40731 Merge pull request #788 from Aranclanos/miningqdel
Mining qdel
2014-05-23 12:28:00 -07:00
Aranclanos
641d6b34ff qdel for mining machinery 2014-05-23 16:25:49 -03:00
d3athrow
6b7e9c83f6 Merge pull request #782 from cloroxygen/Bleeding-Edge
bug fix / update for metal detector
2014-05-23 10:59:56 -05:00
d3athrow
e4d692461c Merge pull request #787 from Aranclanos/Beams
Beams
2014-05-23 08:42:07 -05:00
Aranclanos
020d9afd48 Makes the list of turfs of the beam overlays be cleaned after the overlays are removed. The emitters won't lag the server due to huge for loops of the same turfs over and over. 2014-05-23 05:59:16 -03:00
Rob Nelson
da12bb1757 Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into Bleeding-Edge 2014-05-23 00:41:18 -07:00
Rob Nelson
bb4520c02c Juke bugs. 2014-05-23 00:40:54 -07:00
Aranclanos
9153c99683 this will stop deleting the trails of the magic missile spells 2014-05-23 02:15:28 -03:00
Rob Nelson
17cf73088e Merge pull request #783 from ESwordTheCat/7b#vbri1
Refactor body_scanconsole and scan_consolenew process.
2014-05-22 22:00:05 -07:00
ESwordTheCat
d585a1f842 Add scan_consolenew to refactor. 2014-05-23 06:04:52 -08:00
ESwordTheCat
65e4db24d3 Well, this is shorter. 2014-05-23 05:27:45 -08:00
ESwordTheCat
366db0a516 Okay redo this check. 2014-05-23 05:26:10 -08:00
ESwordTheCat
de7de6ff1e Forgot closing parenthesis. 2014-05-23 05:18:46 -08:00
ESwordTheCat
1e4e1c307e Refactor body_scanconsole process. 2014-05-23 05:15:52 -08:00
Rei1226
a17ae4c56c Fixed issues with the pants sprites not showing up correctly 2014-05-23 00:35:23 -04:00
Rei1226
c8f13512bf Added Kamina's Cape, as well as a few shirtless uniforms 2014-05-22 21:09:11 -04:00
Rob Nelson
02e3f2f53d New gygax sprites by Konater. 2014-05-22 17:14:17 -07:00
Rob Nelson
773e88960a FFix random name generation (Chiyihakiti Hitler, etc.) 2014-05-22 14:38:35 -07:00
Rob Nelson
97c67c2aa8 Add lockdown mode sprites for Durand MK II. 2014-05-22 13:54:21 -07:00
Rob Nelson
c0b2c61b6c Additional fix. 2014-05-22 13:24:32 -07:00
Rob Nelson
d27a56f32c Rework MoMMI eye rendering. Should fix eyes acting weird. 2014-05-22 13:23:08 -07:00
cloroxygen
fe949e278b bug fix / update for metal detector
more stuff, settings, working overlays, actually useful now
2014-05-22 16:14:17 -04:00
Rob Nelson
1a70a23cd2 Gas miners now only pump up to a certain pressure (10,000kPa). 2014-05-22 12:51:09 -07:00
Rob Nelson
a8a68ad3b3 Merge pull request #771 from Erthilo/Bleeding-Edge
Medical Borg Buff
2014-05-22 10:54:58 -07:00
Rob Nelson
60b912bdea Merge pull request #767 from Rei1226/rei20
Bug Fixes, New Suit, New Borg Module
2014-05-22 10:50:33 -07:00
d3athrow
3be87e38be Windoor assemblies now respect the user's direction upon creation. 2014-05-22 11:33:44 -05:00
d3athrow
53fbfc4158 Merge pull request #781 from ESwordTheCat/7b#vbri1
Tweak object pool.
2014-05-22 11:31:38 -05:00
ESwordTheCat
30e26fc157 Remove this too. 2014-05-22 23:56:21 -08:00
ESwordTheCat
3d8b5eca02 Remove debug again. 2014-05-22 23:55:15 -08:00
ESwordTheCat
54ce623b3b Object pool fixed. 2014-05-22 23:54:22 -08:00
ESwordTheCat
0b7785c526 Remove debug. 2014-05-22 23:09:02 -08:00
ESwordTheCat
52a2b514d8 Eh, fix compile error. 2014-05-22 23:06:21 -08:00
ESwordTheCat
7449b896e4 Tweak object pool. 2014-05-22 23:01:29 -08:00
d3athrow
0abfa6dd28 No more quick smash and grabs with display cases 2014-05-22 09:51:21 -05:00
d3athrow
ccf61127f5 prevent infinite toilet dunks or breaking somebodies face super fast on a wall. 2014-05-22 09:49:04 -05:00
d3athrow
7f4c0be941 Re-adding object pooling for beam projectiles. Fixed the double damage bug with a spawn().
What was happening was returntopool was nulling the variable that prevented the projectile from bumping something twice, and for whatever reason despite having no loc the proj would bump the same mob twice then be in the void again. The spawn() allows the bump proc to finish and then the projectile is returned to the pool.
2014-05-22 09:46:11 -05:00
Rob Nelson
cbcbdbe021 aaaaaa 2014-05-22 01:06:44 -07:00
Rob Nelson
98d01d55fc Fix TK checks. I knew I'd fuck it up. 2014-05-22 01:03:58 -07:00
Rob Nelson
0d26303d8b Optimize the fuck out of using checks in machines. 2014-05-22 00:46:40 -07:00
Rob Nelson
8f05130ca8 Buff spiders. 2014-05-21 23:37:26 -07:00
Rob Nelson
7f82427b24 Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into Bleeding-Edge 2014-05-21 23:28:00 -07:00
Rob Nelson
b91ff89aee Fix spiderlings. 2014-05-21 23:27:41 -07:00
Rei1226
60e8de58e2 Merge branch 'Bleeding-Edge' of https://github.com/d3athrow/vgstation13 into rei20
Conflicts:
	html/changelog.html
2014-05-22 01:26:31 -04:00
Rob Nelson
c5f101b281 Merge pull request #777 from ESwordTheCat/7b#vbri1
Micro optimization at GC, new var at machinery, qdel the singularity generator (forgot at refactor) and time check change at sun datum.
2014-05-21 16:14:30 -07:00
ESwordTheCat
9abc742bc9 This is more faster than using division and not operator. 2014-05-22 06:39:34 -08:00
ESwordTheCat
159a20ce3e Add comment about new var. 2014-05-22 06:37:34 -08:00