Commit Graph

17490 Commits

Author SHA1 Message Date
d3athrow
27ca8a9576 Merge pull request #3851 from eswordthecat/wonk
Use the new recursive contents checker at steal items objective
2015-04-10 09:58:43 -05:00
D3athrow
5610615fb3 ingame framework for vgws notes. 2015-04-09 22:53:16 -05:00
D3athrow
257a53de0d should speed up startup. 2015-04-09 14:54:55 -05:00
ririchiyo
cf6ffb6dc3 Merge pull request #3840 from DeityLink/Bomberman
Bomberman update Part 1
2015-04-09 15:44:05 -04:00
eswordthecat
052004a3d1 Use the new recursive contents checker at steal items objective 2015-04-10 02:45:04 +08:00
d3athrow
89a26df5dd Merge pull request #3847 from PsiOmegaDelta/MagicNullreferenceException
Fixes a null reference runtime that occurs if a wizard elects to reset spells.
2015-04-09 13:34:17 -05:00
d3athrow
86707ab1ed Merge pull request #3827 from PJB3005/Randy-Random
Ports the procedural map generator from /tg/.
2015-04-09 13:34:10 -05:00
d3athrow
1e0123aedb Merge pull request #3822 from NigglyWiggly/Gashapon!
Gashapon Machine
2015-04-09 13:34:04 -05:00
d3athrow
1d3677c54d Merge pull request #3335 from Kurfursten/faxprayersounds
Adds sounds to faxes and Prayer. Different sounds.
2015-04-09 13:33:37 -05:00
D3athrow
3ad70446b9 readd access requirements on lockboxes that were missing it. 2015-04-09 12:43:07 -05:00
PsiOmega
6649db8b70 Fixes a null reference runtime that occurs if a wizard elects to re-remember spells.
Caused by spell_list and other lists now containing null elements after spells were deleted.
This should ensure that the screen spell GUI doesn't break permanently.
2015-04-09 14:41:48 +02:00
d3athrow
934679a0e5 Merge pull request #3833 from Boxe/ert_heat_fix
ERT suit heat fix fixes #3185
2015-04-08 18:05:36 -05:00
d3athrow
58d556498c Merge pull request #3832 from NigglyWiggly/Servbots
Servbot fix
2015-04-08 18:04:05 -05:00
D3athrow
bc89549ba5 fix #3838 again 2015-04-08 17:55:44 -05:00
DeityLink
e541d8f97b gdmnit niggly 2015-04-09 00:26:58 +02:00
DeityLink
4a30eecfaf Bomberman part 1 2015-04-09 00:09:36 +02:00
D3athrow
8259471e67 assuming people cant wear silly paper hats. 2015-04-08 14:46:08 -05:00
D3athrow
4dbc83b195 fix runtime for mat synth 2015-04-08 14:45:10 -05:00
D3athrow
cd460bf3fb runtime fix 2015-04-08 14:40:59 -05:00
D3athrow
7bc411bf54 Slow the sun down a bit so powernet machinery can track it a bit better automatically. 2015-04-08 14:40:27 -05:00
NigglyWiggly
fbb10e16f6 removed the "You play with [src]" bit
Kind of unnecessary
2015-04-08 14:26:39 -04:00
Kurfursten
31ec1256cb This adds sounds to faxes to CentComm and Prayer. Different sounds. Also
it halves the fax time, because 3 minutes is just too long.
2015-04-08 12:49:36 -05:00
NigglyWiggly
7fc2d7cec6 Toys and .dme that I forgot earlier 2015-04-08 12:42:58 -04:00
Boxe
90671fc740 oops extra space 2015-04-08 12:25:28 -04:00
Boxe
a04f7319ac fixes ERT fire resist shit 2015-04-08 12:21:35 -04:00
NigglyWiggly
696fd352f9 Servbot fix
I did a really dumb thing that led to invisible combat borgs.
Fuck.
2015-04-08 10:15:08 -04:00
PJB3005
c43c5f528b Ports the procedural map generator from /tg/.
https://github.com/tgstation/-tg-station/pull/7751
Permission to port this at the bottom of the comments.

All Credit goes to @RemieRichards for making this.
2015-04-08 09:33:08 +02:00
NigglyWiggly
eb83f0e70a Maybe I should have waited before I made a PR for this
Jesus Christ I can't stop making little toys
2015-04-07 21:56:45 -04:00
NigglyWiggly
78572dd2f3 Even more toys!
Various spiders, mechanical and otherwise
2015-04-07 21:39:20 -04:00
NigglyWiggly
daa6e4d603 More toys!
Because I apparently forgot that I was working on these when I made the
PR
2015-04-07 21:11:50 -04:00
d3athrow
3dbb3692c7 Merge pull request #3807 from eswordthecat/3644
Fixy fix #3644.
2015-04-07 19:28:52 -05:00
d3athrow
fc6dbade47 Merge pull request #3744 from jewishneocon/GORILLASWHEN
Space Gorillas
2015-04-07 19:28:28 -05:00
NigglyWiggly
b893b6ae92 Gashapon Machine
It's one of those capsule toy things because I'm a huge weeab now or
something.

I'd be willing to bet money that the stuff in toys.dm is so terrible I
might as well just start over
2015-04-07 20:27:14 -04:00
eswordthecat
9d1697e605 pos me 2015-04-08 02:03:21 +08:00
eswordthecat
72049e1096 Fixy fix #3644. 2015-04-08 01:59:19 +08:00
d3athrow
e7a156643b Merge pull request #3811 from Arthurdentist/bugfixes
Prevent you from flipping your virus clown mask up
2015-04-07 12:19:15 -05:00
d3athrow
d59319c364 Merge pull request #3803 from eswordthecat/consistency
Gibber logs.
2015-04-07 12:19:02 -05:00
d3athrow
4bdba4d57d Merge pull request #3809 from clusterfack/artifactfix
Emitterfix
2015-04-07 11:47:49 -05:00
Arthurdentist
fc07f02982 Pierrots Throat mask can no longer be flipped
No flipping your mask up
2015-04-07 12:55:25 +03:00
clusterfack
cb1745fbfc Emitterfix
Addresses #3770 by making emitters turn BACK ON after the powernet they are connected to has power again, as opposed to shutting off permanently.
(This seems to have been the intended behavior originally from the code)
2015-04-07 02:52:36 -05:00
eswordthecat
6b12299b1d Gibber logs. 2015-04-07 11:40:56 +08:00
D3athrow
ae02eecfbc runtime fix 2015-04-06 21:33:31 -05:00
d3athrow
0cf758329c Merge pull request #3729 from VelardAmakar/hairstyles
Added 15 new hair options courtesy of Fury McFlurry
2015-04-06 21:19:09 -05:00
d3athrow
7697450f10 Merge pull request #3789 from NigglyWiggly/Megaman-shit-and-other-assorted-costumes
Costumes and shit
2015-04-06 21:18:52 -05:00
d3athrow
ff65d32054 Merge pull request #3797 from NigglyWiggly/Servbots
Servbots
2015-04-06 21:18:35 -05:00
d3athrow
44fc2671bc Merge pull request #3801 from PJB3005/which-dumb-person-didn't-comment-this-out
why was this not commented out
2015-04-06 21:18:21 -05:00
ririchiyo
9f095530e1 Merge pull request #3790 from NigglyWiggly/Cafe-shit-part-4-I-don't-even-care-anymore-edition
Cafe balance stuff
2015-04-06 22:18:02 -04:00
ririchiyo
7a65bb5ebc Merge pull request #3792 from clusterfack/artifactfix
Fix for artifact
2015-04-06 22:16:40 -04:00
ririchiyo
868421c4f5 Merge pull request #3765 from dylanstrategie/RoboTray
Fixes #3756
2015-04-06 22:14:46 -04:00
ririchiyo
fced482136 Merge pull request #3764 from dylanstrategie/Doctor's-Delight
Fixes #3755
2015-04-06 22:13:25 -04:00