mwerezak
4a2993b20b
Separates the sharp flag into edge and sharp
...
Now weapons can properly cause cuts without necessarily having a greater
chance to remove limbs.
Also separates is_sharp, has_edge, and can_puncture.
Conflicts:
code/__HELPERS/unsorted.dm
code/modules/mob/living/living_defense.dm
code/modules/mob/living/silicon/robot/component.dm
code/modules/mob/living/simple_animal/bees.dm
code/modules/projectiles/gun.dm
code/modules/reagents/reagent_containers/syringes.dm
code/modules/surgery/eye.dm
2014-06-17 06:51:51 -04:00
ZomgPonies
bd346bca9a
Bleh
2014-06-17 04:04:57 -04:00
ZomgPonies
c0f997a022
Fix science shuttle and white windows galore.
2014-06-17 03:44:15 -04:00
ZomgPonies
128e1ba386
Revert "Fix safe...?"
...
This reverts commit 0762e137ab
2014-06-16 22:03:03 -04:00
ZomgPonies
386b1b8307
Fixes a bunch more hurt -> harm checks
2014-06-14 01:02:29 -04:00
Rob Nelson
0762e137ab
Fix safe...?
...
Conflicts:
code/game/objects/objs.dm
2014-06-05 16:21:26 -04:00
Hubblenaut
70d96aedde
Makes crashing into things possible with extinguisher or harm intent
2014-06-03 18:46:52 -04:00
Hubblenaut
2e644b845a
Adds Wheelchairs with basic driving functionality
...
Conflicts:
baystation12.dme
icons/obj/objects.dmi
2014-06-03 18:46:21 -04:00
alex-gh
5555974634
Stunbeams should be effective against janicarts again
2014-06-02 09:53:30 +02:00
ZomgPonies
06bbfcf150
Final Nations patch before live testing. This is going to be painful.
2014-05-27 20:09:10 -04:00
Zuhayr
fbbb3b50ce
Fixes #4923
2014-05-12 03:10:37 -04:00
Razharas
4b2deebec6
Making datum handling not suck balls too hard
...
Yeah now it can roughly be called okish
2014-05-04 22:56:38 -04:00
Razharas
8ee92a0f81
Removing debug shite
2014-05-04 22:56:01 -04:00
Razharas
95b6406adb
Makes this shit actually work
...
Yeah, also added crafting controller to debug controllers(who will need
to debug crafting, but whatever)
Conflicts:
code/controllers/verbs.dm
2014-05-04 22:55:42 -04:00
Razharas
3d762cd892
Readded the crafting to tables
...
Well at least now i can brag about how you can do this with just few
lines
Conflicts:
code/game/objects/structures/tables_racks.dm
2014-05-04 22:54:08 -04:00
Razharas
281fbc7648
Made crafting entirely datum
...
Now it can be useful
Maybe
Probably
I hope
Conflicts:
code/_globalvars/lists/objects.dm
code/game/atoms.dm
code/game/objects/structures/tables_racks.dm
2014-05-04 22:47:38 -04:00
ZomgPonies
679f0fe293
Merge pull request #194 from SamCroswell/master
...
Nukeops Weapons Rework
2014-05-04 15:43:03 -04:00
SamCroswell
740991092a
Nukeops Weapons Rework
...
Nukeops now start with a Stechtkin Pistol instead of the C-20r.
In addition, they now have more items available to purchase in their
uplink (Exclusive to Nukeops). They are as follows:
C-20r - 6TC
L6SAW - 10TC
C-20r Mag - 1TC
L6SAW Mag - 3TC
Stechtkin Silencer - 1TC
Advanced Medkit - 3TC
The prices are, of course, subject to change as we observe further
Nukeops rounds.
2014-05-04 10:24:48 -04:00
ESwordTheCat
532298c725
Tweak object pool system.
...
Conflicts:
code/game/objects/structures/grille.dm
code/modules/projectiles/projectile/beams.dm
code/modules/projectiles/projectile/bullets.dm
code/modules/projectiles/projectile/special.dm
2014-05-03 22:54:09 -04:00
SamCroswell
f4ef7c192b
Map changes, new Ninja masks
...
Map changes including: RnD layout change, new customs lounge, xenoarch
windows fix, and more. Also added a few new Ninja masks in prep for some
bigger changes I have planned.
2014-05-03 18:35:10 -04:00
ESwordTheCat
ebfcc9be79
Object pool for beam projectile, minor changes to object pool.
...
Conflicts:
code/WorkInProgress/Cael_Aislinn/Rust/gyrotron.dm
code/WorkInProgress/Cael_Aislinn/Supermatter/ZeroPointLaser.dm
code/game/objects/structures/grille.dm
code/modules/power/singularity/emitter.dm
code/modules/projectiles/projectile.dm
code/modules/projectiles/projectile/beams.dm
2014-04-29 13:33:06 -04:00
RavingManiac
9bfd6f56ba
Inflatable barrier boxes readded to engineering. Inflatable barriers can no longer be deflated by ghosts.
...
Conflicts:
maps/tgstation2.dmm
2014-04-28 18:47:15 -04:00
Giacomand
9d27cb5d76
Fixes a typo.
2014-04-26 17:28:10 -04:00
Giacomand
0232d945f4
Fixes transit tubes being stuck, it uses process() instead of a spawn'd loop.
...
Segmented the transit tube code into its own folder and code files, for each part of the tube.
Conflicts:
baystation12.dme
code/game/objects/structures/transit_tubes.dm
2014-04-26 17:27:43 -04:00
ZomgPonies
c5c2f52500
Fixed some bugged intents
2014-04-22 11:02:11 -04:00
RavingManiac
850236a137
Shuttle windows replaced with reskinned reinforced glass windows. Number of doors into cockpit reduced to 1.
...
Fitness room rearranged to make more sense, with glass around pool.
Conflicts:
maps/tgstation2.dmm
2014-04-22 09:24:46 -04:00
Rob Nelson
56d8ce28c8
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)
Conflicts:
code/modules/admin/admin_verbs.dm
code/modules/admin/verbs/debug.dm
code/modules/economy/ATM.dm
2014-04-19 20:47:41 -04:00
ESwordTheCat
28b8001188
Implement it to grille.
...
Conflicts:
code/game/objects/structures/grille.dm
2014-04-19 20:00:15 -04:00
ESwordTheCat
c43652b33a
Okay shards converted to pool usage now.
...
Conflicts:
code/game/machinery/computer/arcade.dm
code/game/machinery/doors/windowdoor.dm
code/game/machinery/telecomms/traffic_control.dm
code/game/objects/structures/displaycase.dm
code/modules/mining/mine_turfs.dm
code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
2014-04-19 19:57:53 -04:00
ESwordTheCat
907971e8ab
Grille complete pooling.
2014-04-19 19:42:55 -04:00
ESwordTheCat
424df5eaf7
We object pool grille now.
2014-04-19 19:42:42 -04:00
ESwordTheCat
dde219a581
Object pooling immature implementation.
...
Conflicts:
code/__HELPERS/experimental.dm
2014-04-19 19:42:04 -04:00
Rob Nelson
9227481a8a
Standardize windows.
...
Conflicts:
code/WorkInProgress/buildmode.dm
code/game/machinery/doors/airlock.dm
code/game/objects/items/stacks/sheets/glass.dm
code/game/objects/items/weapons/twohanded.dm
code/game/objects/structures/window.dm
code/modules/mining/mine_items.dm
code/modules/mob/living/carbon/metroid/metroid.dm
code/modules/mob/living/simple_animal/constructs.dm
code/modules/mob/living/simple_animal/friendly/corgi.dm
2014-04-19 19:36:33 -04:00
Jarcolr
abdcf82123
Kicking a grille does 2 less damage; fix for #4557
...
It will now take 10 hits to destroy it without using a weapon or tools.
Take that,metagamers!
2014-04-19 16:06:09 -04:00
Jarcolr
b5056c5441
Cannot wash your missing hands anymore
...
M as mob changed to user as mob; don't know why it was shortened to 1 letter,but eh.
Conflicts:
code/game/objects/structures/watercloset.dm
2014-04-19 16:01:51 -04:00
Jarcolr
935576f5c4
Can no longer use fire extinguisher closet without hands
...
If you did not have hands,you could click on a emergency closet and have it spawn in your hand,and it would stay there,floating.
Cool,right?
2014-04-19 15:53:33 -04:00
RavingManiac
f80d1e702b
Missing files added.
2014-04-19 15:51:27 -04:00
alex-gh
521ad31671
Revert the new lighting system.
2014-04-07 23:51:35 +02:00
Aryn
072bdcde60
I think I fixed everything it is possible to stuff a light source into.
...
Conflicts:
code/game/dna/dna_modifier.dm
code/game/machinery/Sleeper.dm
code/game/objects/structures/transit_tubes.dm
code/modules/reagents/Chemistry-Machinery.dm
code/modules/recycling/disposal.dm
2014-03-21 09:58:54 -04:00
Kzd1
2ac635aacf
-fixed pulse destroyer projectiles not being able to destroy girders
2014-03-12 19:22:06 -04:00
ZomgPonies
c751ee454c
Small fixes
2014-03-06 22:45:38 -05:00
ZomgPonies
7ad775b0a2
Statue fixes
2014-03-06 19:59:07 -05:00
ZomgPonies
d15a9c1b99
Museum first iteration
2014-03-06 16:33:41 -05:00
Rob Nelson
2e9c7aeefc
Vastly improve display case.
2014-02-28 19:09:56 -05:00
ZomgPonies
1358b11e46
ZAS overhaul
2014-02-22 23:10:37 -05:00
ZomgPonies
1ab8df4b13
Garbage collection fixes
2014-02-19 20:24:31 -05:00
SamCroswell
be3c95a9ff
Changes 'n shit
2014-02-07 18:43:48 -05:00
SamCroswell
bd26d1b0b7
Various Pulse Rifle Fixes
2014-02-06 23:10:02 -05:00
RKF45
c69ddf76ec
Reintroducing the dough-based cooking system.
...
Conflicts:
code/modules/food/recipes_microwave.dm
code/modules/reagents/reagent_containers/food/snacks.dm
icons/obj/food.dmi
2014-02-01 19:22:22 -05:00
ZomgPonies
7a99402138
Compile fix
2014-01-31 03:19:42 -05:00
