Rob Nelson
dd9691bb54
Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into melting
...
Conflicts:
code/game/objects/items/stacks/sheets/glass.dm
code/game/objects/items/stacks/sheets/mineral.dm
code/setup.dm
2014-11-02 12:47:21 -08:00
Rob Nelson
ae134e245c
Define melting points.
2014-11-02 12:17:29 -08:00
Chris
d31dcaba9f
Merge branch 'Bleeding-Edge' into bay_hydro_port
...
Conflicts:
code/modules/power/singularity/singularity.dm
2014-10-26 10:56:36 -05:00
DeityLink
fdde481195
cultify() everything! (only obj and turf actually)
...
I don't think adding cultify to mobs is necessary since it's more a
matter of "are they cultists or not" and "are they constructs or not"?
The only exceptions are the hostile creatures that roam in hell.
2014-10-24 17:02:40 +02:00
Chris
5fd4070396
Merge branch 'Bleeding-Edge' into bay_hydro_port x2
...
Conflicts:
code/_onclick/click.dm
2014-10-19 11:54:14 -05:00
DeityLink
b9efb1b675
all is in there
2014-10-19 17:03:12 +02:00
Chris
512b106f0f
Bay hydroponics rewrite port, work in progress.
2014-10-05 02:25:37 -05:00
Heredth
9b9c8b2ecb
Made bolas a small item. Should fix them not going into bola boxes.
2014-09-03 21:12:52 -07:00
ComicIronic
8fb4df4277
Finally fixed: Added craftable bolas
2014-08-11 01:23:06 +01:00
ComicIronic
6361493829
Let this error slip by
2014-08-08 22:04:41 +01:00
ComicIronic
77b9120e1b
Had to fix indentation
2014-08-08 22:03:04 +01:00
ComicIronic
e2cfca2b38
Full paths, because goofball is yelling about it
2014-08-08 21:49:18 +01:00
ComicIronic
6a47b8b810
Mostly functional changes to bolas
...
- No longer uses a projectile
- Throwing a bolas now means that it will travel the maximum distance in one range direction before dropping to the floor
- Mechs have a higher range distance than throwing, because mechanical guns
- No more snowflake code, other than the vector normalising and scaling used in throw_at
2014-08-08 20:27:30 +01:00
Chris
3fd583dbfe
make the animation actually get played
2014-08-07 17:26:25 -05:00
Chris
6a81ab3275
bolas changes *untested :^)*
2014-08-07 17:18:25 -05:00
ComicIronic
a2f477d389
Added bolas to map and machines
...
- Bolas can now be found in sec lockers and the SecVend
- Bolas can now be printed from a hacked autolathe
- Fixed a bug where throwing a bolas at the same tile as its source would create a stationary projectile
2014-08-06 21:30:00 +01:00
ComicIronic
5526a42000
Fixes to bolas
...
- Bolases now drop if the target fails to be cuffed
- Bolases now spawn if the projectile hits a wall
- Bolases now correctly fire from mechs
- Bolases have proper force and a reduced breakouttime variable
2014-08-05 22:07:48 +01:00
ComicIronic
41941bb812
Merge remote-tracking branch 'upstream/Bleeding-Edge' into Bleeding-Edge
2014-08-04 21:10:53 +01:00
ComicIronic
c6c7e3f4bb
Bolas in the game
...
- Throw it at running people to sometimes trip them and legcuff them
- Throw it at walking people to not really do anything at all
- Can be thrown or fired from a mech
- Mech weapon can only be attached to the Gygax
- Allows for ranged security and good crowd control
- Part 1 of 2 changes to Gygax for better sec(TM)
2014-08-04 17:12:06 +01:00
ESwordTheCat
44c626f7ce
Move dbcore into libs/
2014-08-01 06:37:23 -08:00
ESwordTheCat
9b4ec7a04e
Use built-in Crossed rather than HasEntered ( 799c7ad2ce).
2014-07-30 06:20:22 -08:00
iamgoofball
df798b733d
Synthbutts, Synthmeat, Synthbrains, nonplant seed item fixes, etc.
2014-07-27 17:15:13 -07:00
ESwordTheCat
b2fe2a53b4
Use l_color instead of another new variable.
2014-07-20 06:19:08 -08:00
ESwordTheCat
3e9cb1d03e
Refactor some New() procs.
2014-07-17 03:41:51 -08:00
VelardAmakar
8841386f75
Added amanatin, a slow-acting poison that is incredibly lethal when used.
...
Tweaked the damage on amatoxin to be more effective.
2014-07-16 10:08:07 -04:00
ESwordTheCat
8ecfeb19e3
Use create_reagent proc.
2014-07-15 05:49:58 -08:00
Rob Nelson
bf44de510c
Add "can" to VOX vocab
2014-07-07 12:53:25 -07:00
Rob Nelson
663ded5f3f
VOX Updated to limit max words per statement. (No more spamming voxtest2.)
2014-06-27 21:10:20 -07:00
Sjhonkster
f0d5d5dad1
New fatalities for a couple of items, includes changelogs.
2014-06-24 18:31:50 +01:00
Rob Nelson
7de5c91382
Merge #929
2014-06-21 22:33:07 -07:00
Rob Nelson
9041d36f7f
Add efficiency map.
2014-06-21 19:10:50 -07:00
ESwordTheCat
5888bfd68f
Prevent new spawn items to be GC.
2014-06-17 05:13:58 -08:00
ESwordTheCat
ab44b981c8
Import TG latest AStar.
2014-06-11 06:03:07 -08:00
Rob Nelson
993bfc4516
Regex-powered speech filters. Tested locally.
2014-06-04 17:38:51 -07:00
Rob Nelson
65f4751b60
Update with some bay optimizations for mobs.
2014-04-27 15:59:01 -07:00
Rob Nelson
4814883b70
Male VOX.
2014-04-26 22:41:01 -07:00
Rob Nelson
de765116de
Part 1 of economy rework: Spacecash refactor - See commit for full changelog.
...
* Implements stacking and stack overlays
* Simplified tiers of cash (1,10,100,500,1000, may remove 500)
* Simplified API (dispense_cash, count_cash)
2014-04-19 15:58:14 -07:00
d3athrow
008556a561
qdel and Destroy() improvements, now done through objects/items/devices
2014-03-04 20:31:53 -06:00
Rob Nelson
40a6465708
Fuck
2014-02-19 02:21:20 -08:00
Rob Nelson
dcdab7b476
Missing DM script
2014-02-19 02:20:54 -08:00
Rob Nelson
ebec57f142
Add missing sounds, redo biohazard alerts, and station intro.
2014-02-19 02:19:46 -08:00
Rob Nelson
144ebe2a67
VOX: Fuck with echo a bit, vastly improve quality.
2014-02-18 22:08:10 -08:00
Rob Nelson
218414ff83
Add plastic to recycling, make a better way of sorting shit from the line.
...
AND CHANGE EVERYTHIIIIING
2014-02-07 07:33:48 -08:00
Headshotter
c19d82d6f2
New capacitor sprites
...
The current capacitor icons suck and lack different sprites for
different tiers (basic, adv, super).
The new ones I made look more like capacitors and have a different
sprite for each level.
2014-01-31 20:52:58 -02:00
Rob Nelson
4785c7f0a3
Added Dionae, god help us.
2014-01-24 01:35:23 -08:00
Rob Nelson
41b3da12dc
Add "or" and "vampire(s)" to VOX.
2014-01-05 10:14:29 -08:00
Rob Nelson
60f87bbc82
Wire hacking recode from /tg/.
2014-01-04 19:39:36 -08:00
Rob Nelson
a1ac1d9bc5
Imported robot fixes from bay, old/vg/ floorbot fixes.
2014-01-03 16:54:35 -08:00
Rob Nelson
a15262abce
Fix #341 , update VOX sounds.
2014-01-03 09:55:23 -08:00
Rob Nelson
0709a5d48e
Clean up research values, separate job objective goal_level from max_level.
2013-12-28 11:56:35 -08:00
