ikarrus
f4cfd04485
Minor Announcements
...
Head of Staff announcements (ie the ones made via request consoles) are now "Minor Announcements". While head announcements are unchanged, other in-game notifications have been expanded to use their format, including when the Captain joins the game, and early shuttly launch notifications.
They're basically meant to be big and noticable, but not as annoying and spammy as Priority Announcements.
I wanted to include a sound for them, but I've been unable to find one I was satisfied with.
2014-08-14 00:03:43 -06:00
Swag McYolosteinen
8e19262d16
Merge pull request #4411 from scoopscoop/protolatherepeater
...
Clamp function fixed
2014-08-13 18:41:58 +02:00
scoopscoop
f5b5c7c84f
Clamp function fixed
2014-08-13 19:30:35 +03:00
Swag McYolosteinen
681990a835
Merge pull request #4364 from scoopscoop/sciencemineralnotice
...
Ore redemption machine mineral availability notice
2014-08-12 22:22:36 +02:00
Cheridan
cb4c589c80
Merge pull request #4387 from Incoming5643/fireball
...
Magic Mania 1.67: Great Balls of Fireballs
2014-08-12 12:33:50 -05:00
scoopscoop
b14535344b
Rewrote request console code to use a proc when generating a message on a target console
...
Redemption machine now sends a message to chemistry, too.
2014-08-12 13:56:02 +03:00
Alex
ff25503b4d
Merge pull request #4384 from Ikarrus/deputybands
...
[MAP] Boxstation Update and Deputy Armbands
2014-08-12 08:12:15 +01:00
Alex
b05b214d79
Merge pull request #4344 from Aranclanos/removewarn
...
Removes warn button on the player panel.
2014-08-12 08:08:21 +01:00
Alex
9cfb19f511
Merge pull request #4373 from paprka/deepgunlore
...
Whole bunch of gun-related stuff
2014-08-11 16:25:05 +01:00
Alex
53d9aca271
Merge pull request #4371 from paprka/bowmanheadsets
...
Bowman radio headsets
2014-08-11 14:13:26 +01:00
Alex
d5e578c6aa
Merge pull request #4356 from paprka/minerals
...
Asteroid mineral turfs rates and rescaling
2014-08-11 14:03:11 +01:00
Alex
12b8bba238
Merge pull request #4362 from paprka/borghailer
...
Adds sec hailer to secborg modules
2014-08-11 14:02:51 +01:00
Alex
c9bfc556e7
Merge pull request #4345 from Aranclanos/dielighting
...
Removes lights from the machinery process() list
2014-08-11 13:58:05 +01:00
Alex
1f4b217174
Merge pull request #4341 from Aranclanos/secrecords
...
Security records computer small bugfix
2014-08-11 13:51:54 +01:00
Swag McYolosteinen
55a11982da
Merge pull request #4361 from paprka/swatremoval
...
Replaces swat helmet for syndicates
2014-08-11 12:15:56 +02:00
Incoming
41596a0974
Magic Mania 1.67: Great Balls of Fireballs
...
Changes the wand of fireball projectile to have the same !!FUN!! proximity detonation properties as the spell version. Slightly moved the damage types from getting hit by the fireball around to better simulate the experience.
Fun fact about spell fireballs: Because the projectile is desiged to explode if it comes within a square of somebody who isn't the wizard direct contact between fireballs and mobs is very rare. This means that while the fireballs are designed to do an extra 25 brute and 20 burn ON CONTACT this usually doesn't happen.
That's why the added damage on the wand here isn't 25/20, because that would actually make it signigicantly better than the spell.
2014-08-10 20:12:49 -04:00
Swag McYolosteinen
d0a2d94ea9
Merge pull request #4331 from scoopscoop/protolatherepeater
...
Allows the protolathe to build multiples of items.
2014-08-10 10:24:24 +02:00
paprka
e3c26bfdd1
Merge remote-tracking branch 'remotes/upstream/master' into deepgunlore
...
Conflicts:
code/game/objects/items/weapons/storage/uplink_kits.dm
2014-08-09 16:19:33 -07:00
ikarrus
8a5d1325d1
Update boxes.dm
2014-08-09 14:23:37 -06:00
ikarrus
22e0081cf3
Resolved Conflicts:
...
code/game/objects/items/weapons/storage/boxes.dm
2014-08-09 14:19:43 -06:00
ikarrus
3c96428603
[MAP] Boxstation Update and Deputy Armbands
...
-Singularity engine is now sealed off from outer space, making it more secure from saboteurs and safe from meteors
-Deputy armbands (red) added to HoS office. These can be ad-hoc distributed by the HoS when deputizing crew
-Slight remap of HoS office to fit everything in there. added a filing cabinet and paper, too
-Shutters added under robotics and R&D's primary hallway windows
-Filing cabinet and paper added in bridge
2014-08-09 14:11:04 -06:00
Aranclanos
837428babd
Merge pull request #4370 from hornygranny/badmins
...
admins can't edit their rank's powers
2014-08-09 17:02:28 -03:00
Aranclanos
0a7bd48a7b
Merge pull request #4368 from Firecage/Effectabsoluting
...
Adds absolute paths to some effect files.
2014-08-09 16:33:19 -03:00
Aranclanos
e14754d34e
Merge pull request #4372 from Firecage/Itemabsolutepaths
...
Absolute paths for item files.
2014-08-09 16:32:25 -03:00
Aranclanos
e91d00203c
Merge pull request #4354 from Firecage/secondmachineryabsolutes
...
Absolute paths for the other machinery files
2014-08-09 16:32:10 -03:00
Aranclanos
a81777c4b9
Merge pull request #4359 from Firecage/Mechafileabsolutes
...
Mecha files absolute paths
2014-08-09 16:31:57 -03:00
Aranclanos
866bf55b48
Merge pull request #4377 from Jordie0608/ogdensnutgoneflake
...
Fixes #4338 multiple weed nodes on turf
2014-08-09 16:21:32 -03:00
Aranclanos
97c087db27
Merge pull request #4379 from paprka/lolindents
...
Fixes security hardsuit SSU
2014-08-09 16:19:42 -03:00
Cheridan
618c90aac4
Merge pull request #4329 from Justin1693/patch-1
...
Bugfix For Mechs
2014-08-09 11:31:46 -05:00
Cheridan
365de76240
Merge pull request #4340 from MrPerson/giacom_was_right_I_should_have_just_deld_mobs
...
Make new_players dereference from their mind when observing
2014-08-09 11:19:07 -05:00
Aranclanos
ce38868f2d
Merge pull request #4380 from MrStonedOne/fuckingquotes
...
Fixes sql errors caused by odd and unexpected behavor in dbcon.Quote()
2014-08-09 03:54:10 -03:00
MrStonedOne
8a7e5822c1
Fixes sql errors caused by odd and unexpected behavor in dbcon.Quote()
2014-08-08 22:32:56 -07:00
paprka
7282f44b5f
lol indentations
2014-08-08 10:16:48 -07:00
Jordie0608
1ed6d7921c
stops doubling of weed nodes
2014-08-09 01:54:16 +10:00
Alex
b5423346e4
Merge pull request #4307 from Zelacks/alienimagefix
...
Fix for Alien Infection Image
2014-08-08 15:12:37 +01:00
paprka
a65d26f792
Merge remote-tracking branch 'remotes/upstream/master' into deepgunlore
...
Conflicts:
code/modules/projectiles/projectile.dm
2014-08-08 06:48:17 -07:00
Swag McYolosteinen
aaf1ceba1e
Merge pull request #4353 from Firecage/machineryabsolutes
...
Absolute paths for some machinery files.
2014-08-08 12:38:18 +02:00
Swag McYolosteinen
524a5fe848
Merge pull request #4351 from Firecage/somemorefileabsolutes
...
Some more absolute paths for some gamemode files
2014-08-08 12:31:07 +02:00
Firecage
cd35cbfbde
Thanks MIAUW!
2014-08-08 12:26:08 +02:00
Swag McYolosteinen
7225c1fb41
Merge pull request #4350 from Firecage/absolutepathsforsomefiles
...
Absolutepathsforsomefiles
2014-08-08 12:18:22 +02:00
Swag McYolosteinen
1177b3f3ad
Merge pull request #4348 from Firecage/NANOABSOLUTES
...
Nanoabsolutes
2014-08-08 12:16:13 +02:00
Swag McYolosteinen
63692588b9
Merge pull request #4346 from Firecage/FUCKINABSOLUTEPATHS
...
CLUCKING ABSOLUTE PATHS
2014-08-08 12:15:22 +02:00
MrStonedOne
c00a76beab
SQL injection fix.
...
Google sanitizing sql input. almost every single article explains why you should never attempt to roll your own function to do this.
2014-08-08 00:15:33 -07:00
paprka
64bc2abec3
sprite and fix
2014-08-07 14:52:40 -07:00
paprka
726b939754
whole bunch of gun stuff
2014-08-07 14:39:31 -07:00
Firecage
24b18fad93
Absolute paths for item files.
2014-08-07 23:02:43 +02:00
paprka
e901f9b6c1
bowmans
2014-08-07 12:30:14 -07:00
Hornygranny
c538030790
admins can't edit their rank's powers
2014-08-07 12:00:48 -07:00
Firecage
22743b77f4
Adds asbolute paths to some effect files.
2014-08-07 18:59:06 +02:00
scoopscoop
9d47d2c98e
Now uses a proc that generates messages on target console
...
Basically gutted topic code.
2014-08-07 18:38:09 +03:00
