Commit Graph

16948 Commits

Author SHA1 Message Date
Chinsky
1c4734c4e3 Merge pull request #8088 from Raptor1628/dev
Paramedic Job Fixed
2015-02-10 01:00:08 +03:00
Zuhayr
ec6bb08a58 Merge pull request #8012 from SkyMarshal/icarus
Adds two admin weapons and refactors wall damage code.
2015-02-09 22:25:22 +10:30
Raptor1628
76f4001cc1 Paramedic Job Fixed
Adds Paramedic job as outlined on the forums. Reduces MD access to EVA,
adds some minor EMT clothing stuff, and fixes #8020 and the medgreen
armband while I was piddling around in sprites.
EMT alt title and indent fixed.

Now less broken.

![](http://i.imgur.com/vOSoJy0.png)
2015-02-08 17:23:02 -05:00
PsiOmega
91b971b223 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-02-08 20:29:03 +01:00
SkyMarshal
a78ef81712 To make PsiOmegaDelta happy
I hate this format.  Bluh bluh huge bitch
2015-02-08 04:04:06 -07:00
SkyMarshal
c8d6214657 Fix indent thing for pointdefense 2015-02-08 04:03:19 -07:00
SkyMarshal
84c40171e7 The icarus gun now acts as a spotter. The Icarus can now be fired via adminverbs. 2015-02-08 04:03:19 -07:00
SkyMarshal
dadea3c7fa Adds two admin weapons and refactors wall damage code.
The Icarus is now fireable in gun form.  The point defense mode fires several lasers one after the other so that it can penetrate.  The main gun mode fires a modified meteor.  Also added an "abstract weapon" which has the projectile type settable for admin shenanigans.
Walls now lack an armor variable, which is replaced with buffed health.  Normal walls take 4 shots with a normal laser or 5 emitter bursts to destroy.  Reinforced walls now take 20 normal laser shots or 28 emitter shots.
Added some proactive runtime protection to logging for projectile impacts.  Without a valid firer, the jump button is linked to the victim.
2015-02-08 04:01:35 -07:00
Ccomp5950
8f2720b179 Merge pull request #8052 from mwerezak/boolit
New bullet types, projectile refactor
2015-02-07 14:07:22 -05:00
mwerezak
fac32d07e9 Merge remote-tracking branch 'upstream/dev' into boolit
Conflicts:
	code/modules/projectiles/projectile.dm
	code/modules/projectiles/projectile/beams.dm
2015-02-07 00:57:04 -05:00
Ccomp5950
33e2fae704 Merge pull request #7967 from Kelenius/ofSlimesAndHumans
Update for the slimes
2015-02-07 00:20:13 -05:00
Ccomp5950
3ba295dadb Merge pull request #8073 from Loganbacca/projectilescleanup
Code cleanup
2015-02-07 00:17:24 -05:00
mwerezak
414ad6b6da Merge remote-tracking branch 'upstream/dev' into pacman
Conflicts:
	code/modules/power/port_gen.dm
2015-02-06 23:32:39 -05:00
mwerezak
0b8940da79 Merge remote-tracking branch 'upstream/dev' into boolit 2015-02-06 20:23:05 -05:00
mwerezak
5494b4d8c9 Supply packs, autolathe recipes, magazine and box definitions. 2015-02-06 20:16:35 -05:00
unknown
39b467c9da New bullet types, projectile rewrite
* Refactors projectile Bump()
* Converts projectile_type var strings to paths
* Reorganizes bullet projectile paths
* Made a pass through all the bullet_act() definitions. Mainly ensured that damage_type is checked when dealing damage to certain objects. Removed stupid /turf bullet_act() override, replaced with on_hit() overrides on the relevant projectiles.

* Adds shotgun pellets projectile. Adds Raptor's shotgun slug sprite.
* Gives stunshots more of their own identity, refluffs them as taser cartridges for shotguns. They still aren't obtainable anywhere unless spawned.
* Makes projectiles pass through girders and cultgirders with a certain probability, unless the girder itself was clicked.
* Projectiles are also able to pass through grilles. Low damage projectiles have a chance to be blocked by grilles. High damage projectiles have a chance to have some damage absorbed by the grille.
* Makes projectiles for blanks invisible.
* Adds flash bullet types
* Adds support for 'penetrating' projectiles
* Swaps .45 and 9mm projectile types. .45s hit slightly harder, 9mils have more ammo capacity.
2015-02-06 20:09:32 -05:00
Loganbacca
7cc440aecc Absolute paths
- Cleaned up projectile.dm and beams.dm
2015-02-07 13:37:12 +13:00
Zuhayr
5c7a217d40 Merge pull request #8060 from comma/polaroid
Adjustable tint windows
2015-02-06 22:44:16 +10:30
GinjaNinja32
f0e92023f0 Fixes startup runtime
Fixes #8062
2015-02-06 08:54:28 +00:00
Chinsky
3ddd0b480f Merge pull request #8061 from Baystation12/master
master -> wiz
2015-02-06 10:41:12 +03:00
Chinsky
b83f1ac3d2 Adjustable tint windows. Use buttons to change opacity. Super advanced technology to introduce milder alternative to metal shutters everywhere. 2015-02-06 10:33:41 +03:00
Chinsky
3ea720fd9d Buttons refactoring. Introduced wonders of inheritance, cutting down on inconsistencies and copypaste. 2015-02-06 09:53:05 +03:00
Chinsky
3df6d38d2d Merge pull request #8047 from Neerti/1_30_2015_new_shuttle
Expanded Escape/Transfer Shuttle
2015-02-06 02:32:04 +03:00
Neerti
22ac05f9a0 Turns out, a new path isn't needed in the first place, and the bugs I found was me being dumb. Isn't that just grand?
Reverts the /nolatejoin path.
2015-02-05 16:41:00 -05:00
Chinsky
3384f13a31 Merge pull request #8029 from GinjaNinja32/viro
Virology rework
2015-02-06 00:18:13 +03:00
Chinsky
2100c51905 Merge pull request #8042 from PsiOmegaDelta/HearItSayIt
Silicons now have some timestamped input
2015-02-06 00:15:15 +03:00
Chinsky
abd3396a13 Merge pull request #8041 from PsiOmegaDelta/SetMyName
Silicons can now more easily be correctly renamed.
2015-02-06 00:15:07 +03:00
Chinsky
fc4e6796ce Merge pull request #8035 from PsiOmegaDelta/CanHasNano
NanoUI/Topic make-over
2015-02-06 00:15:04 +03:00
Zuhayr
43d576dcc5 Merge pull request #8054 from mwerezak/chembottles
Replaces chem bottles with their overlay equivalents
2015-02-05 23:05:45 +10:30
PsiOmega
a073cba477 Merge remote-tracking branch 'upstream/dev' into CanHasNano
Conflicts:
	code/setup.dm
2015-02-05 12:37:15 +01:00
mwerezak
9caf76d069 Glass bottles are now dispensed with the lid on
It seemed kind of silly that vendors, for example, would dispense
bottles with their lids off.
2015-02-05 00:41:59 -05:00
mwerezak
8da0fb7f43 Merge remote-tracking branch 'upstream/dev' into chembottles
Conflicts:
	code/modules/hydroponics/hydro_tools.dm - flags var
2015-02-05 00:37:19 -05:00
mwerezak
59bbf3a883 Replaces chem bottles with their overlay equivalents 2015-02-05 00:31:56 -05:00
Atlantiscze
e98dc5eada RCON Sorting
- RCON Console SMES entries are now sorted alphabetically by RCON tag, rather than being semi-random.
2015-02-05 00:30:37 +01:00
Neerti
6567c68ecb Merge remote-tracking branch 'remotes/upstream/dev' into 1_30_2015_new_shuttle 2015-02-04 13:34:48 -05:00
Neerti
13d8bd47e7 Adds subtype of the AI core structure to disallow latejoining.
Fixes a bug where carding an AI would free open a slot.
Adds cameras and holopads to the shuttle and a few areas at Centcom.
Adds check to AI's Life() to make sure it won't die in areas which have magical free power.
Adds subtype of oxygen canister, which starts off very cold.  This is meant to replace the freezer on Centcom, and for the emergency shuttle's cryo.
2015-02-04 13:29:55 -05:00
SkyMarshal
d5c8a6262a Fixes the fix for supersonic walking. 2015-02-04 10:33:39 -07:00
Ravensdale
7d502aa255 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mapSanity 2015-02-04 07:40:20 -08:00
Chinsky
4f541758c6 Merge pull request #8003 from Jamini/dev
Added Tajran, Lizardfiend, and Slugfiendian depiction transformations for the CE rig
2015-02-04 18:17:32 +03:00
Chinsky
8a46903231 Merge pull request #7830 from PsiOmegaDelta/CanTrack
Camera tracking logic cleanup and tracking notice feature.
2015-02-04 18:17:21 +03:00
Chinsky
f8b94456ba Merge pull request #7844 from Kelenius/ofDryingAndRacks
Adds drying racks, tobacco, and updates pipes
2015-02-04 18:15:13 +03:00
Chinsky
f1c5c9d08d Merge pull request #7680 from Skully71/chancespawn
Add a chance spawn object to enable spawning a given object at chance
2015-02-04 18:14:31 +03:00
Chinsky
82ca870c53 Merge pull request #8028 from GinjaNinja32/beaker
Change beakers, bottles, syringes and vials to use /image and multiplicative blending
2015-02-04 18:14:22 +03:00
Chinsky
f386d2eb47 Merge pull request #7979 from PsiOmegaDelta/GhostSight
Ghosts now have more sight options.
2015-02-04 17:31:21 +03:00
Ravensdale
fcb2770004 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mapSanity 2015-02-04 05:15:23 -08:00
RavingManiac
8bc85c6bca Missing files added 2015-02-04 20:40:39 +08:00
SkyMarshal
952fd3a373 Fixes supersonic walking with canes. 2015-02-04 05:30:56 -07:00
RavingManiac
38d62a278a Holodeck code moved to modules, holo-object code put in separate file. Holodeck expanded from 5x10 to 10x10. Holodeck areas updated accordingly. Holodeck courtroom added. Holodeck gravity can now be toggled. Reduced stun-time from gravity turning on. Changed the thunk() message a bit. Window-doors can now be deleted silently.
Changelog updated.
2015-02-04 20:05:43 +08:00
Skully71
3d2abddaa7 Add random single object to enable a given object to be spawned at chance 2015-02-04 10:41:47 +01:00
PsiOmega
f045f5b2e9 Timestamped speech for silicons. 2015-02-04 10:12:01 +01:00