cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,503 Commits 5 Branches 0 Tags
eed87489ca2cfa6f360b4375ca5290bec3d914aa
Commit Graph

4160 Commits

Author SHA1 Message Date
Miniature
eed87489ca Merge branch 'master' of github.com:Baystation12/Baystation12 2012-05-15 00:52:14 +09:30
Miniature
773253a5ec Fixed a mirrored tvalve icon, made mirrored tvalves do initialize_directions properly 2012-05-15 00:51:02 +09:30
Albert Iordache
b2022e5333 Merge pull request #1053 from SkyMarshal/BugFixes 
Bugfixes for some temperature sharing, added variable editing by reference, fixed up some wound stuff.
 2012-05-14 02:43:50 -07:00
SkyMarshal
be6368b71c Bugfixes for some temperature sharing, added variable editing by reference, fixed up some wound stuff. 2012-05-13 23:18:02 -07:00
Albert Iordache
674432ae22 Merge pull request #1052 from SkyMarshal/BugFixes 
Adds runtime detection to the atmos ticker.  20 ticks of runtimes, total, will kill atmos.
 2012-05-13 22:36:22 -07:00
SkyMarshal
c7133a17a7 Adds runtime detection to the atmos ticker. 20 ticks of runtimes, total, will kill atmos. 2012-05-13 22:14:53 -07:00
Albert Iordache
dc65d21054 Merge pull request #1051 from SkyMarshal/BugFixes 
Some feedback shit for deleted airgroups, as well as a possible fix for "NT, admins"
 2012-05-13 21:42:50 -07:00
SkyMarshal
46e104f978 Merge pull request #1044 from Erthilo/master 
TG Updates up to r3585
 2012-05-13 21:38:34 -07:00
SkyMarshal
c54d44517e Some feedback shit for deleted airgroups, as well as a possible fix for NT and his admins command. 2012-05-13 21:14:18 -07:00
SkyMarshal
5e45382ded Fuck atmospherics code. Actually, Fuck BYOND @.@ 2012-05-13 14:32:59 -07:00
SkyMarshal
bdc0de5fd0 Fixes numerous bugs from the Runtimes topic, more sanity checking on pipes and atmos stuff for the new FEA. 2012-05-13 13:52:40 -07:00
Albert Iordache
2c08c02099 Tempfix for atmos runtime errors 2012-05-13 22:21:53 +03:00
Erthilo
f5bf874d17 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-05-13 16:16:48 +01:00
Albert Iordache
9d645d80c7 Merge pull request #1041 from Flashkirby/master 
Fixes capitalisation inside names
 2012-05-13 03:00:39 -07:00
Erthilo
1443df2beb TG: Updated fire extinguisher cabinets- mini extinguishers now fit in them, and the 
path has changed!
/obj/structure/closet/extinguisher to /obj/structure/extinguisher_cabinet

Added Invisty's dragon dildo sprite
Updated the husk icons for carn

Revision: r3584
Author: 	 petethegoat

-New sound effects for circular saws and surgical drills.
-New sprites for mass-spectrometers and advanced mass-spectrometers.
-Sprites for empty bookshelves and book overlays added to library.dmi.

Revision: r3585
Author: 	 d_h2...@yahoo.com
 2012-05-13 02:19:36 +01:00
SkyMarshal
702064e258 Merge pull request #1043 from SkyMarshal/FEA 
Made pipes update right.
 2012-05-12 18:00:59 -07:00
SkyMarshal
ec593612a9 Made pipes update right. 2012-05-12 17:59:48 -07:00
Erthilo
8c3659b1c7 TG: -Laser tag guns no longer give combat tech of 3. 
-Cardborg Helmets and Cueball helmets no longer protect as well as sec helmets.
Reorganized the clothing/head.dm. PLEASE take note of the parent when making
child objects, people.
-Laser tag vests can now hold their matching laser tag guns.
-Harebells can now be harvested.
-Sprite for the new mini-extinguishers in the extinguisher closets. Needs
supporting code still.
-Added towel sprite to items.dmi.
Revision: r3582
Author: 	 d_h2...@yahoo.com
 2012-05-13 00:56:53 +01:00
Erthilo
7cc3b7fb43 TG: AutoUpdateTK lags tremendously. TK functions as it used to before Doohl gave it 
a minibuff.
This is not to be added again until it someone rights a less laggy version.
Revision: r3580
Author: 	 rockdtben
 2012-05-13 00:42:09 +01:00
Erthilo
be9ff4e9e1 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-05-13 00:33:07 +01:00
Erthilo
ab552e20d1 TG: Renamed access_medlab to access_genetics. 
Gave the RD his genetics access back.

Added Invisty's hyperspace tiles.
Added Icarus's map updates (Sec, gateway room, genetics/RD access) ((this is a
big overhaul to sec)).
Added Flashkirby99's SMES sprites.

Updated the changelog.
Revision: r3576
Author: 	 petethegoat
 2012-05-13 00:24:34 +01:00
Flash Kirby
ec6e1ab880 Added in a script so that a new name is capitalized properly, but will keep uppercase letters e.g: 
urist mcDorf --> Urist McDorf.
 2012-05-13 00:04:21 +01:00
Erthilo
2a0caf890d TG: - Added QualityVan's fix for large glass windows not requiring 2 glass pieces. 
- Took 'Evolve Greater Changeling' off the Evolution menu. It still exists, it's
just hidden until it's finished (i.e. gets a sprite)
Revision: r3575
Author: 	 johnsonmt88
 2012-05-12 23:27:24 +01:00
Erthilo
f3e8997463 TG: Hotfix for the Holodeck. 
Revision: r3574
Author: 	 johnsonmt88
 2012-05-12 23:25:51 +01:00
SkyMarshal
c43ee6dc57 Merge pull request #1037 from comma/master 
Police tape overhaul
 2012-05-12 12:28:41 -07:00
unknown
9efafd39bd Police tape overhaul 
General purge of copypaste code

Framework for easier adding of new tape types
Now you only need two sprites of roll and sprites of tape length (H and V)
Define them in police_tape.dm

To show it off, engineering tape added, passable by engineers and atmos techs

Last but not least - ability to lift the tape, allowing passage for pretty much everything.
Done by those with access, attack by empty hand on help intent.
 2012-05-12 22:16:23 +03:00
CIB
a17e3d4656 Merge pull request #1035 from Erthilo/master 
Various bug fixes.
 2012-05-12 11:11:57 -07:00
Albert Iordache
f73191b6e3 TempFix for air groups being nulled and crashing the server 2012-05-12 20:04:20 +03:00
Erthilo
64d5a2f033 Fixes crayons drawing without having a crayon. 2012-05-12 17:36:37 +01:00
Erthilo
dbbcefa9ca Adds logging for throwing living mobs and throwing items that hit living mobs. 2012-05-12 17:24:05 +01:00
Erthilo
aaa3e11993 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-05-12 16:42:54 +01:00
Erthilo
0850cd8ba4 Prevents chameleon effects from entering teleporters, hotfix for mobs being deleted. 2012-05-12 16:40:26 +01:00
SkyMarshal
893529c69e Fixes some FEA stuff, for a general improvement to how well the system runs. 2012-05-11 18:19:00 -07:00
SkyMarshal
50f7332740 Lets not keep debug in, whoops. 2012-05-11 18:06:21 -07:00
SkyMarshal
502c66664c Some more work on FEA, WIP FEA/ZAS work, does not effect the game currently. 2012-05-11 18:06:21 -07:00
SkyMarshal
15d72e3b0e Improves how gas mixture datums are handled, reduces proc calls, commenting. Removed ghost-heating from cryo and "oxygen_agent_b" gas type. 2012-05-11 18:02:30 -07:00
Erthilo
035bc3541f Fixes contraband and arts and craft crate. 2012-05-12 00:12:15 +01:00
Albert Iordache
ded68393ac Merge pull request #1027 from Miniature/master 
freelook bugfix, more information for admins in some ban messages
 2012-05-11 11:06:58 -07:00
Hawk-v3
fc2a7f3a81 More Breakroom things, and a second Json fix. 2012-05-11 18:47:00 +01:00
Miniature
2a7336f61f Merge branch 'master' of github.com:Baystation12/Baystation12 
Conflicts:
	config/config.txt
 2012-05-12 00:52:42 +09:30
Miniature
77987f76f5 Made banned people who aren't banned under the same key they are trying to log in as show what key they were banned as to admins 
turned on the thing to show where to go to appeal
 2012-05-12 00:48:17 +09:30
Miniature
e3772d4158 Made picking a camera through the camera list actually work, also a couple of comments 2012-05-11 23:59:02 +09:30
CIB
776a033252 Merge pull request #1020 from Hawk-v3/master 
Trying to stop JSON -> WORLD dumps.
 2012-05-11 01:42:03 -07:00
CIB
adda7a042d Merge pull request #1021 from Lexusjjss/genBranch 
Created Industrial PACMAN generator with a Kirby sprite.
 2012-05-11 01:41:23 -07:00
Lexus Langg
2ccf6e604a Created Industrial PACMAN generator with a Kirby sprite. 
Made matching circuit board and R&D imprinter design.
My first real commit. =P

Signed-off-by: Lexus Langg <jaedonjacobi@yahoo.com>
 2012-05-10 18:55:27 -07:00
Albert Iordache
43af079496 Merge pull request #1019 from Erthilo/master 
Fixes a rogue period in Tajaran examine, also fixes various glasses not working on Tajaran.
 2012-05-10 18:39:08 -07:00
Hawk-v3
5a24d138b5 Trying to stop JSON -> WORLD dumps 2012-05-11 01:09:10 +01:00
Erthilo
434434e8c1 Fixes a rogue period in Tajaran examine, also fixes various glasses not working on Tajaran. 2012-05-11 00:29:10 +01:00
SkyMarshal
83b69a94b9 Merge pull request #1017 from Hawk-v3/master 
HAWKMAPS (GASP)
 2012-05-10 15:28:13 -07:00
Hawk-v3
c57476fcc7 HAWKMAPS(Gasp) 
Shared Breakroom for Atmos, Engineering and Robotics. It's a proper den and has, to ENVY OF STATION, comfy chairs. And a recharger for borgbros.

Added updated armoury page.
 2012-05-10 23:26:44 +01:00