cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 04:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,017 Commits 5 Branches 0 Tags
a3962980ac5b75ba9b51a0d1bb694d26ba6dee3a
Commit Graph

322 Commits

Author SHA1 Message Date
Zuhayr
0b03a389df Merge pull request #8910 from Baystation12/master 
Master into dev
 2015-04-19 17:26:04 +09:30
PsiOmega
a4fbb01e2b Makes it possible to write [date] and [time] to get the current date and time in ISO 8601 format. 2015-04-18 18:40:35 +02:00
Chinsky
9377932b30 Made get_area return master to avoid usual pitfalls with lighting subareas breaking everything 2015-04-15 16:12:47 +03:00
PsiOmega
516b60962e Merge remote-tracking branch 'upstream/dev' into CultPorting 2015-04-14 15:54:22 +02:00
PsiOmega
1511e2b3f4 Ports /vg/'s Nas-Sie remake. 
Second phase:
New Nar-Sie itself.
Two endgame phase - Nar-Sie and Supermatter Cascade.
Culty mobs.
 2015-04-12 16:19:16 +02:00
Zuhayr
0223223c77 Merge pull request #8753 from Neerti/4-4-2015_borg_module_stuff 
Revenge of the Research Module (and other stuff from that PR)
 2015-04-12 13:16:45 +09:30
PsiOmega
9181a2a43a Fixes atom pooling return code. 2015-04-11 10:28:15 +02:00
=
78987a436a Merge resolution. 2015-04-11 13:23:17 +09:30
PsiOmega
990530d118 Ports /vg/'s spell system for the sake of cult porting. 
Does offer a much more pleasant basis to work with in the future, if someone wishes to add more spell-like abilities.
 2015-04-09 20:08:06 +02:00
Chinsky
e6f83f8fa2 Merge pull request #8707 from PsiOmegaDelta/Garbage 
Ports /vg/&/tg/'s garbage collector.
 2015-04-09 08:50:12 +03:00
Chinsky
4a897e47b9 Merge pull request #8641 from PsiOmegaDelta/CultVisualNetwork 
Cult Visual network
 2015-04-06 20:19:49 +03:00
Neerti
326fde4c5f Adds the research module, condensed into one commit so far. 2015-04-04 20:17:59 -04:00
volas
2622d2dbfc sanitize() refactor: fourth pass 2015-04-03 00:40:57 +03:00
PsiOmega
c305b389f7 Ports /tg/'s & /vg/'s garbage collector/object pool. 
It's happening. Kind of, the code is there.
 2015-04-02 14:48:28 +02:00
PsiOmega
a9034bca66 Merge remote-tracking branch 'upstream/dev' into CultVisualNetwork 
Conflicts:
	code/modules/mob/living/simple_animal/shade.dm
	code/setup.dm
 2015-03-30 22:55:24 +02:00
Zuhayr
0c3a18b0b6 Merge pull request #8380 from volas/sanitize_procs 
[DNM] sanitize() and text.dm refactoring
 2015-03-29 00:57:33 +10:30
PsiOmega
827351dda5 Merge remote-tracking branch 'upstream/dev' into Mask2 2015-03-27 14:16:55 +01:00
PsiOmega
1131c76d45 Cult visual network. 
Implementation of a cult visual network, similar to the original camera network.
Includes the "eye" itself and the initial construction of a mob that can control one.
 2015-03-27 14:16:48 +01:00
Zuhayr
c0887333bc Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-freeze 2015-03-27 11:13:53 +10:30
Zuhayr
d26800d29c Preliminary work on converting all monkeys to a human subspecies. 2015-03-25 02:15:45 +10:30
volas
f8822626bb sanitize() refactor: second pass(other sanitize functions) 2015-03-23 01:38:09 +03:00
volas
855755f808 sanitize() refactor: first pass (sanitize) 2015-03-22 23:31:19 +03:00
PsiOmega
c371f24514 Fixes #8565. 
Increases the name change limit from 30 seconds to 5 minutes.
 2015-03-22 19:34:30 +01:00
volas
a5cfca1ee8 Merge remote-tracking branch 'upstream/dev' into sanitize_procs 
Conflicts:
	code/__HELPERS/text.dm
 2015-03-22 20:37:17 +03:00
Chinsky
d2518798ec Merge pull request #8486 from PsiOmegaDelta/NanoLaws 
NanoUI - Silicon law manager
 2015-03-17 14:24:30 +03:00
PsiOmega
d3fac52e11 do_after/do_mob code cleanup. 
Cleans up the code a bit and makes do_mob() make regular checks, similar to do_after().
 2015-03-17 08:13:34 +01:00
PsiOmega
7f68403ae4 NanoUI - Silicon law manager 
NanoUI interface for viewing silicon laws, accessible to both the silicon and admins.
Malf AIs and admins may also add, edit, and remove laws.
 2015-03-17 07:22:02 +01:00
PsiOmega
ce30b00287 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/setup.dm
	icons/mob/items_righthand.dmi
	maps/exodus-1.dmm
	maps/exodus-5.dmm
 2015-03-13 09:23:26 +01:00
PsiOmega
3af652fb77 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-03-12 10:30:16 +01:00
Mloc
d96e46bf10 fix sanitize_simple(), broken in #8008 
fixes OOC newlines and IRC bot crashing.

Signed-off-by: Mloc <colmohici@gmail.com>
 2015-03-11 11:39:02 +00:00
PsiOmega
533ccef0ab Robot code clean up and fixes. 
Fixes runtime when a borg is reset.
Fixes issue where /proc/select_active_ai_with_fewest_borgs() would not always return the intended AI.
Fixes issues with new borgs spamming the master AI with creation messages under some circumstances.
 2015-03-10 13:37:20 +01:00
PsiOmegaDelta
d2ab1713ee Merge pull request #8383 from comma/timetravel 
Randomized roundstart hour
 2015-03-09 21:17:11 +01:00
Loganbacca
54971c1bf5 Projectile effects - Part 1 
- Added base projectile effects framework
- Added vector movement helper
- Added temporary effect sprites
 2015-03-09 22:17:06 +13:00
Chinsky
2d6b8a9a82 Randomizes roundstart time, one of few times 5 hours apart are picked. 2015-03-07 16:25:40 +03:00
volas
96fe1b9268 sanitize() refactor: text.dm 2015-03-07 13:05:41 +03:00
PsiOmega
02a1e1d129 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/clothing/spacesuits/rig/suits/light.dm
 2015-03-01 21:15:47 +01:00
Zuhayr
64b33c43db Refactors some job variables from the Economy file (what the fuck) and swaps created types for lists in bot access assignment. 2015-02-28 20:20:19 +10:30
Zuhayr
0f6a3adf68 Fixes #8256 2015-02-28 16:28:54 +10:30
Zuhayr
ee0d63a43d Merged with dev. 2015-02-24 17:03:39 +10:30
PsiOmega
1c763ff2c9 Merge remote-tracking branch 'upstream/dev' into subsystems 2015-02-23 10:32:32 +01:00
PsiOmega
5578afa07c General update. 
NanoUI interface sorted.
Accessible by AI, borgs, and through consoles.
Automatic alarm resets in case of lost sources.
 2015-02-23 10:32:25 +01:00
Zuhayr
2139884244 Dev merge. 2015-02-21 19:49:47 +10:30
mwerezak
57ffdc82f6 Replaces stool structures with stool items 2015-02-18 01:06:00 -05:00
Zuhayr
ae1161184c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro 2015-02-18 14:17:39 +10:30
PsiOmega
ec4b8c78a1 Merge remote-tracking branch 'upstream/dev' into subsystems 
Conflicts:
	code/game/machinery/camera/camera.dm
	code/modules/mob/mob.dm
 2015-02-17 08:36:12 +01:00
PsiOmega
2e9c266a2f Basic main structure for centralized alarm handling. 2015-02-17 08:34:26 +01:00
Zuhayr
4631e53718 Merge pull request #8140 from comma/undies 
Underwear closet, crossdressing
 2015-02-17 03:03:45 +10:30
Zuhayr
9c45f000ec Merge with dev. 2015-02-16 20:34:07 +10:30
Chinsky
541bcd757e Merge pull request #8141 from Baystation12/master 
master -> dev
 2015-02-16 11:53:14 +03:00
Chinsky
3f8462a399 Adds a wardrobe structure to pick your underwear. 
Adds ability to wear female underwear as male and vice versa.
Changes 'underwear'/'undershirt' vars to hold iconstate instead of esoteric dances with array indexes.
 2015-02-16 11:17:22 +03:00