201 Commits
Author SHA1 Message Date
SoundScopes b051ddbac6 Pipe painter bug 2014-12-12 09:55:51 +00:00
SoundScopes ea0abc0fba Turf entering proc change thing 2014-12-11 15:35:29 +00:00
SoundScopes 687f6826c0 Protolathe diamonds are right again 2014-12-11 09:00:38 +00:00
SoundScopes 198270922c Jetpack Examine bugfix 2014-12-11 05:24:27 +00:00
Zuhayr 6fc7a99617 Merge branch 'development' of https://github.com/Zuhayr/Aurora into dev 2014-11-21 18:44:03 +10:30
Zuhayr a721eb3abb Ports Xenobotany from Bay. Does not compile due to map faults; hence untested. 2014-11-21 18:29:35 +10:30
SoundScopes 22ce3a4bd8 Playing Cards 2014-11-18 22:18:01 +00:00
SoundScopes f25ee4ee9f Yay Updates
Needs fixing:
See how quickly the powernet drains at default load, I thought atmos
went to quickly so I upped the power cell by one level,
Shuttle Tags,
Graphical glitches involving some wires,
There is still some things missing with NanoUI but they are not game
breaking in any way I have seen so far.

Other than that we should be good to go.
2014-11-12 19:12:22 +00:00
SoundScopes 153123c9b7 Now 2014-11-06 12:46:38 +00:00
SoundScopes 318cb6603b Merge pull request #1 from Duck-/master
dupdates
2014-11-06 12:29:27 +00:00
SoundScopes 4090f46636 Merge branch 'master' into development
Conflicts:
	code/game/machinery/cryopod.dm
	code/game/objects/structures/stool_bed_chair_nest/bed.dm
	code/modules/supermatter/supermatter.dm
2014-11-06 01:25:13 +00:00
skull132 3c04d7199d Bay Merge 05NOV2014
Known errors:

* A set of errors tied to updating the fire overlays.
* A single error related to a dischephency between new and old slime
code
* A set of errors related to the recharging of stun batons
* A single error due to old machinery code coming from your grav
generator file
* A single error error from your space cooler code, due to old
atmopsherics code
* A playerpanel warning
* An error tied to extinguishing and old atmos code.
2014-11-05 23:58:05 +02:00
SoundScopes e36f821824 Weapon Lockbox 2014-11-04 14:35:00 +00:00
SoundScopes 79f3b501c7 More noticeable log 2014-11-01 10:55:59 +00:00
SoundScopes c90f1b3aab C4 staff messgaes 2014-10-31 12:06:43 +00:00
Duck- 3e90118b63 i got GRENADE
i got GRENADE-- grenade timers are now adjustable because someone put
the det time in "quotes" and that broke it.  fixed.
2014-10-19 00:20:53 -04:00
skull132 7db6d8dd32 Space Law to Corporate Regulations
Because yes, books.
2014-10-11 22:10:28 +03:00
SoundScopes 67a4ce0d78 Merge pull request #288 from SoundScopes/master
Log fixes
2014-10-09 06:31:50 +01:00
SoundScopes 45094c30c2 Log fixes
Bombing logs
2014-10-09 06:30:22 +01:00
SoundScopes ede61d3883 Merge pull request #286 from SoundScopes/master
Admin logs
2014-10-09 02:14:43 +01:00
SoundScopes e52dfb52a1 Admin logs
Powersinks exploding tell staff
2014-10-09 02:11:48 +01:00
SoundScopes 5b58426bff Merge pull request #284 from SoundScopes/master
Scopes updates
2014-10-09 01:34:03 +01:00
SoundScopes 0c7163f892 C4 Logs
C4 Added to bombing log
2014-10-09 01:27:37 +01:00
Meowykins be0b0f6405 Hotfix for Bats
Changed weight to 4.0. No more concealing.
2014-10-08 17:01:38 -05:00
skull132 0b7a687fa6 Test
Testing.
2014-10-08 21:53:44 +03:00
skull132 d74975b247 Merge pull request #278 from Meowykins/master
Watches, custom, ect.
2014-10-08 21:40:33 +03:00
Meowykins 0f781ed3f3 Bats
Bats and stuff.
Metal, wood, plasteel variants.
All with varying degrees of robustness.
2014-10-07 01:11:48 -05:00
skull132 dad1705c46 Baystation12 Hardsuit Code
Porting over the code.
2014-10-04 22:25:40 +03:00
SoundScopes 8651d53470 Supercharge Fail
Supercharged flashes have a chance of burning the user
2014-10-04 04:12:14 +01:00
SoundScopes d2c6350884 Extinguishing mob on fire
For some reason this was removed.
2014-10-03 23:47:09 +01:00
skull132 c5232b39b5 Merge pull request #270 from skull132/development
Skull Update
2014-09-24 21:08:41 +03:00
skull132 bab7a4d788 Telebaton Nerf
Changes the weaken to stunbaton levels. Original derp by me.
2014-09-24 21:06:20 +03:00
SoundScopes f998447a5b BugDuck
Bug Fixes from ducks merge
2014-09-24 11:37:19 +01:00
SoundScopes 0f1a34f6d7 Merge pull request #11 from Duck-/master
small things this update
2014-09-23 20:02:00 +01:00
Duck- d272c77fb3 wheelchairs
wheelchairs.  fixes lasereyes for wizard mutate.  might need nerfs.
uncertain.  too tired.
2014-09-18 23:13:03 -04:00
SoundScopes 2fa09d9732 JMP links on attack logs
Added JMP links to all attack logs
2014-09-17 15:19:22 +01:00
SoundScopes b258227443 Mod messages
Messages for Mods
2014-09-17 14:34:00 +01:00
Duck- bb5de59a6e Vamp buffs, isocubes (needs sprite), other stuff
Vamps: Hypnotize now a free power, cooldown increased.  Space bats
nerfed, but ability now summons two as before since they don't kill each
other anymore.  Vampjaunt brought back down to thirty.  Holy water
ignites and burns vamps.

Laserpointer permablinding severely nerfed.  Bad idea in retrospect.

Added things to custom gear prefs.

All energy weapons made more accurate, to compare with bulletweapons
being generally way more deadly.  Snipers/modulasers accuracy buffed, to
account for aiming at a distance being broken.

Isocubes.  They're done but need a sprite.  Pocket dimension that you
suck highly dangerous criminals into.  Spell edits were mostly to
contain wizards and vamps from poofing out, which would cause them to be
permastunned since only getting ejected removes the permastun.
2014-09-14 22:38:22 -04:00
Duck- 0aeab2dca9 Botany changes
Poisonous plants you'll now eat in a single bite.  Because poisoning.
Poisoned cyanide death apples enabled in mutations.  They look just like
normal apples!  Be careful.  Death nettles buffed significantly,
considering it's a tri-department effort to even get them, and that's
excluding potency growth.
2014-09-13 16:24:04 -04:00
Duck- e1c6ac807c Merge pull request #8 from Aurorastation/master
wondrous things
2014-09-08 18:42:36 -04:00
Duck- b6f60ca2c9 the bugfixening:laser pointers
fixes admin log runtimes.  hooray.
2014-09-08 18:35:13 -04:00
skull132 692fb8b25e Merge pull request #253 from SoundScopes/master
Scopes updates
2014-09-07 20:29:21 +03:00
skull132 b75d23fa6f Merge pull request #257 from Meowykins/master
Stuff for stuff.
2014-09-07 20:27:05 +03:00
Meowykins 68f9b08db3 Ch-ch-changes. Time to face the strange.
Autolathe
-New items(sunglasses, lantern, bone setter, pill bottle, new empty
oxygen tank)
Communications
-Head access only. Captain access req. removed. Redundant if Heads have
access.
Edits to Items
-All items added to the autolathe now have matter amounts.
New Oxygen Tank
-Special to the autolathe. Spawns without air.
2014-08-31 14:13:22 -05:00
SoundScopes 26b6df341f Burning people with cigarettes
- Harm intent with a lit cigarette burns people
2014-08-31 06:49:16 +01:00
Duck- 83a06403dc Laser pointers, overchargeflashes, various fixes
Alcohol and thermite now flammable.  Laser pointers added!  Flash now
comes in delicious incendiary flavor.  Robot fire overlay bug fixed-ish.
Being lit on fire turns off a borg's lights but the fire still shows.
I'll take it.  Shield gens actually useable by the people they were
meant for.
2014-08-29 21:52:16 -04:00
SoundScopes 5259c3564e HTML log fix, Fryer messages
- HTML code for logs
- Better fryer messages
2014-08-29 14:34:02 +01:00
skull132 82c29d2487 Merge pull request #251 from skull132/development
Skull's stuff, 28AUG2014
2014-08-28 22:34:53 +03:00
skull132 5b6797538a Defibs Burn
Because yes.
2014-08-28 22:32:23 +03:00
skull132 175ed36430 Teddy bears!
One for the psychiatrist, one for the whiny nurse (Jenifer).
2014-08-28 22:30:43 +03:00