cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 02:16:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,468 Commits 73 Branches 18 Tags
01d2471fc99d186b70213110428cc3a9f3489b5b
Commit Graph

327 Commits

Author SHA1 Message Date
D3athrow
01d2471fc9 Merge branch 'color_replace_2_electric_boogaloo' into Bleeding-Edge 
Conflicts:
	code/ATMOSPHERICS/pipe/pipe_dispenser.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/machinery/embedded_controller/embedded_controller_base.dm
	code/modules/mining/money_bag.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/silicon/mommi/mommi.dm
	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
	code/modules/research/destructive_analyzer.dm
	code/modules/research/rdconsole.dm
	code/modules/research/xenoarchaeology/machinery/analysis_base.dm
	code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm
	code/modules/research/xenoarchaeology/tools/ano_device_battery.dm
 2015-04-12 16:40:59 -05:00
ComicIronic
d0e9eedd25 drop_item and click code. 
drop_item now has a first arg, which is the item to drop.
Hand processing now uses drop_item properly, which fixes #3874, #3796.
Also fixes #3486.
 2015-04-12 00:56:43 +01:00
eswordthecat
6423eb38ed Remove duplicate procs. 2015-03-23 01:49:16 +08:00
Michael H.
7e2ab7966d fixed thing 2015-03-16 16:40:16 -04:00
Michael H.
daa1fc3d26 Optimized code a bit 
thanks comic
 2015-03-16 15:13:34 -04:00
Michael H.
85227e1ee4 actually fixed logging 
i need to stop getting so lazy
 2015-03-14 23:29:52 -04:00
Michael H.
0111ed78b8 fixed issue with logging 2015-03-14 19:15:18 -04:00
Michael H.
0064155e0f fixed check i just added 
did you know that velard is retarded
if you didn't, now you know
 2015-03-13 12:15:32 -04:00
Michael H.
488317b59d what the fuck, git 
aaaaaaa
 2015-03-13 11:25:30 -04:00
Michael H.
0783575fd2 Added more logging as well as an extra check 
i really should have thought to add that check
 2015-03-13 11:24:35 -04:00
VelardAmakar
8f268407ea Added explosive beartraps. 
Attach an IED to a beartrap to blow someone's legs off when it clamps.
Use a screwdriver to get the bomb off the trap.
 2015-03-12 18:21:12 -04:00
D3athrow
4ded52118a clean up gender declarations 2015-03-12 12:51:58 -05:00
D3athrow
03c23d4ee6 gender things. 2015-03-11 12:55:34 -05:00
D3athrow
f82ed0af3a GENDER IS A SOCIAL CONSTRUCT YOU CISGENDERED SCUM - Added datum proc to set gender, if somebody gets set to a non male or female gender as a human it should give you a stacktrace in the runtime log. 2015-03-11 00:17:05 -05:00
ComicIronic
34bab36581 Changes to drop_item. 
The drop_item arg is now the loc placed, not the child of the loc or whatever.
Removed a few lines of items being placed into themselves, on themselves, into other things manually, into their users, etc.
Cleans up the fix for MoMMI recharger silliness.

This took about 2 hours of non-stop manual searches.
 2015-03-08 21:37:34 +00:00
ComicIronic
b44a0430a8 Initial cable changes. 2015-02-17 13:28:28 +00:00
d3athrow
ed9bb025a0 Merge pull request #2787 from ComicIronic/BolasClean 
Bolas cleanup.
 2015-02-05 20:08:53 -06:00
ComicIronic
9c50b769ae Bolas cleanup. 
Babby's first code needed some cleanup to bring it in line with standards.
Noticed an issue with the screwdriver being placed in the mob sometimes.
 2015-02-03 22:11:39 +00:00
D3athrow
9c7e64a91a remove admin logging 2015-02-02 23:16:27 -06:00
D3athrow
391170bd39 more qdel so far 2015-02-02 01:57:27 -06:00
D3athrow
292c61bea3 Clean up proximity_sign item. 2015-01-31 13:19:46 -06:00
D3athrow
72fde47f91 micro optimization, Cut() to len = 0 2015-01-31 00:40:13 -06:00
clusterfack
c273f2b9eb Fix conflicts with OOP solars, fix exploit with shard welding, add TG unlocking borgs with PDA, robotizing fixed to prevent getting stuck within objects, number of DNA blocks increased to 54 to match number of genes, fix numerous problems with solar construction and deconstruction. 
Changelog
 2015-01-26 19:19:15 -06:00
ComicIronic
92ebe71396 Removed the NOSHIELD flag. 
Unused in code.
 2015-01-08 19:08:21 +00:00
ComicIronic
53a421014d Removed USEDELAY and NODELAY flags. 
Flags were unused.
Were previously used, but code is now commented out.
 2015-01-08 00:47:52 +00:00
ComicIronic
9c9e1ff808 Removed the TABLEPASS flag. 
No longer in use in any of the code.
Also changed cases of flags being set to null instead of 0.
 2015-01-03 18:33:47 +00:00
ComicIronic
5e5bbf03fd Removed the CONDUCT flag. 
Use Siemens, you dolts.
This is the start of completely redoing the flag system, but it starts with removing these oldcode flags.
 2014-12-26 18:13:52 +00:00
DeityLink
13dd1d0130 The winter update, part 1 2014-12-12 20:50:34 +01:00
Chris
0a52ae3239 Camera bug rework 2014-12-10 13:16:47 -06:00
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
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
9b4ec7a04e Use built-in Crossed rather than HasEntered (799c7ad2ce). 2014-07-30 06:20:22 -08:00
ESwordTheCat
3e9cb1d03e Refactor some New() procs. 2014-07-17 03:41:51 -08:00
Sjhonkster
f0d5d5dad1 New fatalities for a couple of items, includes changelogs. 2014-06-24 18:31:50 +01:00