Commit Graph

8291 Commits

Author SHA1 Message Date
DeityLink
2b88b0ad49 Adminbus fixing final part: goodbye Isolated 2014-11-27 13:41:30 +01:00
DeityLink
cbfd4ec08a solving conflict 2014-11-27 06:47:56 +01:00
Chris
b97676bfc7 fix being able to eat people from afar 2014-11-26 14:34:51 -06:00
Chris
a15a954308 Bep bop, map vote pops up if it happens. 2014-11-26 11:17:50 -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
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
8011f03fa3 Adminbus fixing part 7 2014-11-25 06:01:30 +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
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
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
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
eswordthecat
c7e51a0adb system_integrity from bay. 2014-11-23 19:08:36 -08:00
DeityLink
8134f72199 WHO TOUCHED GUN.DMI? 2014-11-23 16:27:54 +01:00
DeityLink
5684a34a6c Adminbus fixing part 1 2014-11-23 16:19:23 +01:00
Chris
e473d95de2 Fix a couple metastation issues
- Fixed erroneous sprites on poddoors, floors, and shutters
 - Fixed missing distro and disposal pipes.
2014-11-22 21:37:10 -06:00
ComicIronic
85939755fc General gun bugfixing.
Assault rifle icons now work properly.
Energy guns no longer spawn cells when they're destroyed.
Fixed a runtime with something trying to call .has_gravity on a null area.
2014-11-22 16:06:12 +00:00
d3athrow
2b6977e12c Merge pull request #1900 from ComicIronic/MechanicPort
[WIP] Changing the balance designs of mechanic.
2014-11-21 13:14:26 -06:00
DeityLink
b70d458c52 Merge remote-tracking branch 'origin/Bleeding-Edge' into adminbus-final 2014-11-21 07:19:53 +01:00
DeityLink
ed5a2463b7 Adminbus Final part 2014-11-21 05:57:08 +01:00
DeityLink
7890a3f08b Adminbus part 6 2014-11-21 01:42:55 +01:00
SkowronX
336daaa2d3 stop giving me cancer 2014-11-19 21:18:36 -06:00
ComicIronic
b6667da5c2 Fixed Durand plates not being buildable. 2014-11-19 20:36:14 +00:00
Chris
9f7919c077 I'm dumb
Give robot a message and sound when the upgrade is completed.
2014-11-19 12:45:07 -06:00
Chris
5ecbd71726 Fix Recharge Station Upgrade issues. 2014-11-19 10:41:52 -06:00
Chris
883c39af19 Made the matter synth not a pita to use. Cut down synthesizing steps from 3 to 1. 2014-11-19 01:08:14 -06:00
Chris
a25c1bbeb9 Haha time for upgrades. 2014-11-19 00:32:28 -06:00
Chris
f04b91f1d2 cyborg matter synth contains (reinforced) plasma glass 2014-11-18 23:22:32 -06:00
Chris
c8f5412224 Cyborg matter synth tweaks.
reduced borg cost by half, no longer able to scan new materials in to synthesize.
2014-11-18 23:02:31 -06:00
Chris
2da98b3a70 Keep mommis from wielding 2 hand items. 2014-11-18 19:36:37 -06:00
Chris
c706015067 Engiborgs can use the jetpack upgrade now. 2014-11-18 19:28:01 -06:00
Chris
b53e1bacc1 Mommi and engineering borg changes.
IN DEV:
mommi round start cell charge 7500 -> 10k
mommi and engineering borgs have meson toggle now at no charge cost
engineering borgs regenerate consumables passively at half the rate of being in a recharge station
engineering borgs cannot slip in space anymore
2014-11-18 18:58:26 -06:00
d3athrow
e5bab09ff2 Merge pull request #1925 from PJB3005/bugs-be-squashed
CE access hotfix
2014-11-18 16:50:36 -06:00
PJB3005
a1faa72387 CE access hotfix
Gives the CE mechanics access
2014-11-18 23:09:19 +01:00
d3athrow
1a9dc96692 Merge pull request #1919 from ComicIronic/PDAPaintRedo
Added PDA printer to map and changelog.
2014-11-18 14:24:54 -06:00
d3athrow
d4e8f56163 Merge pull request #1922 from N3X15/cleanup-logs
Clean up the logs a bit.
2014-11-18 14:24:41 -06:00
Chris
e586a49e82 thanks job controller. 2014-11-18 13:57:43 -06:00
Rob Nelson
b719ac5715 Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into cleanup-logs 2014-11-18 11:38:47 -08:00
d3athrow
34c2c0ecd2 Merge pull request #1920 from Duny-/Grafix_stuff
Replaced all warning stripes effects with the ones from my previous PR
2014-11-18 13:00:03 -06:00
d3athrow
21628419ce Merge pull request #1916 from Kurfursten/medborg-prod
Medborg prod
2014-11-18 12:59:43 -06:00
Chris
d8142b6c9c goodbye mommi 2014-11-18 12:46:18 -06:00
DeityLink
5afca6f51f Adminbus part5 2014-11-18 14:43:28 +01:00
Duny-
08d7f7fb13 Updated tile painter
Because I'm a faggot and I used new names for some of the stuff
2014-11-18 12:26:14 +01:00